Skip to content

Commit eebbf5a

Browse files
author
BRUNER Patrick
committed
fix for automated release build
1 parent a1e6ec9 commit eebbf5a

3 files changed

Lines changed: 29 additions & 14 deletions

File tree

.github/workflows/release.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,15 @@ jobs:
3636
- name: Update usedComponents.json
3737
shell: pwsh
3838
run: |
39-
# Generate updated component list (packages already restored by build)
40-
$output = nuget-license -i src/LogExpert.sln -o JsonPretty
39+
# Generate updated component list (packages already restored by build).
40+
# -override supplies license info for packages whose nuspec omits it (e.g. Nuke.GitHub),
41+
# which otherwise makes nuget-license exit non-zero.
42+
$output = nuget-license -i src/LogExpert.sln -o JsonPretty -override "src/Solution Items/nuget-license-overrides.json"
43+
if ($LASTEXITCODE -ne 0) {
44+
Write-Host "::error::nuget-license failed with exit code $LASTEXITCODE"
45+
Write-Host $output
46+
exit 1
47+
}
4148
Set-Content -Path "src/Solution Items/usedComponents.json" -Value $output -Encoding UTF8
4249
4350
- name: Commit generated files to Development

src/Directory.Packages.props

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,26 @@
1010
<PackageVersion Include="CsvHelper" Version="33.1.0" />
1111
<PackageVersion Include="DockPanelSuite.ThemeVS2015" Version="3.1.1" />
1212
<PackageVersion Include="GitVersion.Core" Version="6.3.0" />
13-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.4.0" />
13+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
1414
<PackageVersion Include="Moq" Version="4.20.72" />
15-
<PackageVersion Include="NAudio" Version="2.2.1" />
15+
<PackageVersion Include="NAudio" Version="2.3.0" />
1616
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
17-
<PackageVersion Include="NLog" Version="6.1.2" />
17+
<PackageVersion Include="NLog" Version="6.1.3" />
1818
<PackageVersion Include="NuGet.CommandLine" Version="6.14.0" />
19-
<PackageVersion Include="NuGet.Versioning" Version="7.3.1" />
19+
<PackageVersion Include="NuGet.Versioning" Version="7.6.0" />
2020
<PackageVersion Include="Nuke.Common" Version="9.0.4" />
2121
<PackageVersion Include="Nuke.GitHub" Version="7.0.0" />
22-
<PackageVersion Include="NUnit" Version="4.5.1" />
22+
<PackageVersion Include="NUnit" Version="4.6.1" />
2323
<PackageVersion Include="NUnit.ConsoleRunner" Version="3.20.1" />
2424
<PackageVersion Include="NUnit3TestAdapter" Version="6.2.0" />
2525
<PackageVersion Include="SSH.NET" Version="2025.1.0" />
2626
<PackageVersion Include="System.CommandLine" Version="2.0.8" />
27-
<PackageVersion Include="System.Drawing.Common" Version="10.0.7" />
28-
<PackageVersion Include="System.Resources.Extensions" Version="10.0.7" />
29-
<PackageVersion Include="Vanara.Library" Version="5.0.4" />
30-
<PackageVersion Include="Vanara.PInvoke.DwmApi" Version="5.0.4" />
31-
<PackageVersion Include="Vanara.PInvoke.RstrtMgr" Version="5.0.4" />
32-
<PackageVersion Include="Vanara.PInvoke.Shell32" Version="5.0.4" />
33-
<PackageVersion Include="Vanara.PInvoke.User32" Version="5.0.4" />
27+
<PackageVersion Include="System.Drawing.Common" Version="10.0.8" />
28+
<PackageVersion Include="System.Resources.Extensions" Version="10.0.8" />
29+
<PackageVersion Include="Vanara.Library" Version="5.0.5" />
30+
<PackageVersion Include="Vanara.PInvoke.DwmApi" Version="5.0.5" />
31+
<PackageVersion Include="Vanara.PInvoke.RstrtMgr" Version="5.0.5" />
32+
<PackageVersion Include="Vanara.PInvoke.Shell32" Version="5.0.5" />
33+
<PackageVersion Include="Vanara.PInvoke.User32" Version="5.0.5" />
3434
</ItemGroup>
3535
</Project>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[
2+
{
3+
"Id": "Nuke.GitHub",
4+
"Version": "7.0.0",
5+
"License": "MIT",
6+
"LicenseUrl": "https://github.com/GeorgDangl/Nuke.GitHub/blob/develop/LICENSE.md"
7+
}
8+
]

0 commit comments

Comments
 (0)