Skip to content

Commit 06b10e2

Browse files
HirogenHirogen
authored
Merge pull request #598 from LogExperts/nuget_license_packaged_components_fix
Nuget license packaged components fix
2 parents a1e6ec9 + e0cc3bc commit 06b10e2

5 files changed

Lines changed: 51 additions & 36 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

‎build/_build.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
<ItemGroup>
1313
<PackageReference Include="chocolatey" Version="2.7.1" />
1414
<PackageReference Include="GitVersion.Core" Version="6.7.0" />
15-
<PackageReference Include="Microsoft.Build" Version="18.4.0" />
16-
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.4.0" />
17-
<PackageReference Include="NuGet.CommandLine" Version="7.3.1">
15+
<PackageReference Include="Microsoft.Build" Version="18.6.3" />
16+
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="18.6.3" />
17+
<PackageReference Include="NuGet.CommandLine" Version="7.6.0">
1818
<PrivateAssets>all</PrivateAssets>
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2020
</PackageReference>
21-
<PackageReference Include="NuGet.Packaging" Version="7.3.1" />
22-
<PackageReference Include="NuGet.Versioning" Version="7.3.1" />
21+
<PackageReference Include="NuGet.Packaging" Version="7.6.0" />
22+
<PackageReference Include="NuGet.Versioning" Version="7.6.0" />
2323
<PackageReference Include="Nuke.Common" Version="10.1.0" />
2424
<PackageReference Include="Nuke.GitHub" Version="7.0.0" />
2525
<PackageReference Include="NUnit.ConsoleRunner" Version="3.22.0" />
26-
<PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.7" />
26+
<PackageReference Include="System.Security.Cryptography.Xml" Version="10.0.8" />
2727
</ItemGroup>
2828

2929
<ItemGroup>

‎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>

‎src/PluginRegistry/PluginHashGenerator.Generated.cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,35 +10,35 @@ public static partial class PluginValidator
1010
{
1111
/// <summary>
1212
/// Gets pre-calculated SHA256 hashes for built-in plugins.
13-
/// Generated: 2026-06-08 13:17:25 UTC
13+
/// Generated: 2026-06-08 14:41:04 UTC
1414
/// Configuration: Release
1515
/// Plugin count: 21
1616
/// </summary>
1717
public static Dictionary<string, string> GetBuiltInPluginHashes()
1818
{
1919
return new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
2020
{
21-
["AutoColumnizer.dll"] = "16DEB420EABF7547B1424B1D351A6724475E75E1A30B8334E860124E2A556B11",
21+
["AutoColumnizer.dll"] = "9204D09A3A292611A299164FE55457E074EF26BB8AC04B525C82D1F86878C70A",
2222
["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
2323
["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6",
24-
["CsvColumnizer.dll"] = "AA2D059B60E64CEC69ABBC79B1EE5B02E1BE0EB224F709D529B22AF2229BC938",
25-
["CsvColumnizer.dll (x86)"] = "AA2D059B60E64CEC69ABBC79B1EE5B02E1BE0EB224F709D529B22AF2229BC938",
26-
["DefaultPlugins.dll"] = "6628F596C75DE32EAB4E6AA9A5A6F15E4E778E46C268B0E1C946633ACD55087B",
27-
["FlashIconHighlighter.dll"] = "BEF9FD438AEA8C8B63BEBFF1B7AACF74682F00D68EF13B245C207305D38BA582",
28-
["GlassfishColumnizer.dll"] = "B81D7C2928A3AA797AD405E272BB728001FADA3976A3C6EA26E276186A75D973",
29-
["JsonColumnizer.dll"] = "518DD3566DD7E3F8591577D16525CDB6C401E16327CA8458B512362B7F8DCE7A",
30-
["JsonCompactColumnizer.dll"] = "9530D380AB2D662C3B5EE63FFCA6D509F135B20CCD0E064B4718476D737FEEDC",
31-
["Log4jXmlColumnizer.dll"] = "05B5683EEB2276482AB3EB83FDFE0680F1382F0A82B453F1AD55DBEAFD23E7DB",
32-
["LogExpert.Resources.dll"] = "9D843408A5C4B8FCF3B780E7495FC23DD9BF76066351285A09643089BF5703D1",
24+
["CsvColumnizer.dll"] = "09694D6F828AE036CECB983A004ABAB6A9B05539E670C642AD9F8440828F2942",
25+
["CsvColumnizer.dll (x86)"] = "09694D6F828AE036CECB983A004ABAB6A9B05539E670C642AD9F8440828F2942",
26+
["DefaultPlugins.dll"] = "4FCDA7C98D3184119BE57AB3E22B40889F48278C2504F29C35CF3E2497D306EC",
27+
["FlashIconHighlighter.dll"] = "6B2F76FD5943E4E328A1D042624E1766C92C5909C0BDC12D395582425D039A01",
28+
["GlassfishColumnizer.dll"] = "9AE2A91F3402B7FE138757495C05C61FCF1CB3D75D407881919A7296027C231F",
29+
["JsonColumnizer.dll"] = "55EB5FBAB7964B9295A49256D826AE3B803F77B8C44CC253F52F2F3393B8B38E",
30+
["JsonCompactColumnizer.dll"] = "AC66C875C48B5729660CAA2F60901AAD49DB81E90C19A8A43E808EE32789D7F7",
31+
["Log4jXmlColumnizer.dll"] = "B8C06431ED331CDBCD70678CA4C8976785B3828E16BC6EBF855DDBEB5AD36E49",
32+
["LogExpert.Resources.dll"] = "37B943E9A68108E3155CB885367E14D6B81E8721182F0BE880BFA161AF0DB668",
3333
["Microsoft.Extensions.DependencyInjection.Abstractions.dll"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
3434
["Microsoft.Extensions.DependencyInjection.Abstractions.dll (x86)"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93",
3535
["Microsoft.Extensions.Logging.Abstractions.dll"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
3636
["Microsoft.Extensions.Logging.Abstractions.dll (x86)"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D",
37-
["RegexColumnizer.dll"] = "817455920EEBDB247AF3B7EAE1F872AD95EB2A5CED728AE02687A386BA387FE0",
38-
["SftpFileSystem.dll"] = "BF1FE53D2A4ECF000718F67CCBA193BB670D859C6C2D449075C15C2F52812579",
39-
["SftpFileSystem.dll (x86)"] = "E1BAC2E86D11A768BF9750A269E9748CC24EA5FD59E52FEB508B9FFBFB8541D6",
40-
["SftpFileSystem.Resources.dll"] = "05CF7AAB99459310CA52A1C0C7675C44EAF64AEB852793F5A73DA8AE405E10B5",
41-
["SftpFileSystem.Resources.dll (x86)"] = "05CF7AAB99459310CA52A1C0C7675C44EAF64AEB852793F5A73DA8AE405E10B5",
37+
["RegexColumnizer.dll"] = "1014404A647FAF26CF19C9186E4BF5E1A17614A281B917C869DAB67C89B1BD66",
38+
["SftpFileSystem.dll"] = "ED6C05BA660754E4B466C129E52298A93309391B4E8944C0C5989F6820514EDF",
39+
["SftpFileSystem.dll (x86)"] = "F21802A8E877838D856E14D1D32535622623088FA59F6F141F43686531660D54",
40+
["SftpFileSystem.Resources.dll"] = "BD63A4CED4F31842A50BC28BC9DF4E813EFAD9305D64F8BF2546DC8C3A566413",
41+
["SftpFileSystem.Resources.dll (x86)"] = "BD63A4CED4F31842A50BC28BC9DF4E813EFAD9305D64F8BF2546DC8C3A566413",
4242

4343
};
4444
}

‎src/Solution Items/nuget-license-overrides.json‎

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)