From eebbf5ab851dbe3644e7e3f68ded250239e300a3 Mon Sep 17 00:00:00 2001 From: BRUNER Patrick Date: Mon, 8 Jun 2026 16:06:55 +0200 Subject: [PATCH 1/3] fix for automated release build --- .github/workflows/release.yml | 11 +++++++-- src/Directory.Packages.props | 24 +++++++++---------- .../nuget-license-overrides.json | 8 +++++++ 3 files changed, 29 insertions(+), 14 deletions(-) create mode 100644 src/Solution Items/nuget-license-overrides.json diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 17461dd5..35bd6d44 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,8 +36,15 @@ jobs: - name: Update usedComponents.json shell: pwsh run: | - # Generate updated component list (packages already restored by build) - $output = nuget-license -i src/LogExpert.sln -o JsonPretty + # Generate updated component list (packages already restored by build). + # -override supplies license info for packages whose nuspec omits it (e.g. Nuke.GitHub), + # which otherwise makes nuget-license exit non-zero. + $output = nuget-license -i src/LogExpert.sln -o JsonPretty -override "src/Solution Items/nuget-license-overrides.json" + if ($LASTEXITCODE -ne 0) { + Write-Host "::error::nuget-license failed with exit code $LASTEXITCODE" + Write-Host $output + exit 1 + } Set-Content -Path "src/Solution Items/usedComponents.json" -Value $output -Encoding UTF8 - name: Commit generated files to Development diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 3c79dd57..df1144ac 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -10,26 +10,26 @@ - + - + - + - + - + - - - - - - - + + + + + + + \ No newline at end of file diff --git a/src/Solution Items/nuget-license-overrides.json b/src/Solution Items/nuget-license-overrides.json new file mode 100644 index 00000000..bebb324c --- /dev/null +++ b/src/Solution Items/nuget-license-overrides.json @@ -0,0 +1,8 @@ +[ + { + "Id": "Nuke.GitHub", + "Version": "7.0.0", + "License": "MIT", + "LicenseUrl": "https://github.com/GeorgDangl/Nuke.GitHub/blob/develop/LICENSE.md" + } +] From 993408dbd5884a44c47e91ae92ef7eefac1385fe Mon Sep 17 00:00:00 2001 From: BRUNER Patrick Date: Mon, 8 Jun 2026 16:07:51 +0200 Subject: [PATCH 2/3] build project references --- build/_build.csproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/_build.csproj b/build/_build.csproj index a1f4a547..99d88925 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -12,18 +12,18 @@ - - - + + + all runtime; build; native; contentfiles; analyzers - - + + - + From e0cc3bcc3c804215ebbfd4b392a8719a3429343c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 8 Jun 2026 14:41:06 +0000 Subject: [PATCH 3/3] chore: update plugin hashes [skip ci] --- .../PluginHashGenerator.Generated.cs | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/PluginRegistry/PluginHashGenerator.Generated.cs b/src/PluginRegistry/PluginHashGenerator.Generated.cs index 1a7cc822..d99a7db9 100644 --- a/src/PluginRegistry/PluginHashGenerator.Generated.cs +++ b/src/PluginRegistry/PluginHashGenerator.Generated.cs @@ -10,7 +10,7 @@ public static partial class PluginValidator { /// /// Gets pre-calculated SHA256 hashes for built-in plugins. - /// Generated: 2026-06-08 13:17:25 UTC + /// Generated: 2026-06-08 14:41:04 UTC /// Configuration: Release /// Plugin count: 21 /// @@ -18,27 +18,27 @@ public static Dictionary GetBuiltInPluginHashes() { return new Dictionary(StringComparer.OrdinalIgnoreCase) { - ["AutoColumnizer.dll"] = "16DEB420EABF7547B1424B1D351A6724475E75E1A30B8334E860124E2A556B11", + ["AutoColumnizer.dll"] = "9204D09A3A292611A299164FE55457E074EF26BB8AC04B525C82D1F86878C70A", ["BouncyCastle.Cryptography.dll"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6", ["BouncyCastle.Cryptography.dll (x86)"] = "E5EEAF6D263C493619982FD3638E6135077311D08C961E1FE128F9107D29EBC6", - ["CsvColumnizer.dll"] = "AA2D059B60E64CEC69ABBC79B1EE5B02E1BE0EB224F709D529B22AF2229BC938", - ["CsvColumnizer.dll (x86)"] = "AA2D059B60E64CEC69ABBC79B1EE5B02E1BE0EB224F709D529B22AF2229BC938", - ["DefaultPlugins.dll"] = "6628F596C75DE32EAB4E6AA9A5A6F15E4E778E46C268B0E1C946633ACD55087B", - ["FlashIconHighlighter.dll"] = "BEF9FD438AEA8C8B63BEBFF1B7AACF74682F00D68EF13B245C207305D38BA582", - ["GlassfishColumnizer.dll"] = "B81D7C2928A3AA797AD405E272BB728001FADA3976A3C6EA26E276186A75D973", - ["JsonColumnizer.dll"] = "518DD3566DD7E3F8591577D16525CDB6C401E16327CA8458B512362B7F8DCE7A", - ["JsonCompactColumnizer.dll"] = "9530D380AB2D662C3B5EE63FFCA6D509F135B20CCD0E064B4718476D737FEEDC", - ["Log4jXmlColumnizer.dll"] = "05B5683EEB2276482AB3EB83FDFE0680F1382F0A82B453F1AD55DBEAFD23E7DB", - ["LogExpert.Resources.dll"] = "9D843408A5C4B8FCF3B780E7495FC23DD9BF76066351285A09643089BF5703D1", + ["CsvColumnizer.dll"] = "09694D6F828AE036CECB983A004ABAB6A9B05539E670C642AD9F8440828F2942", + ["CsvColumnizer.dll (x86)"] = "09694D6F828AE036CECB983A004ABAB6A9B05539E670C642AD9F8440828F2942", + ["DefaultPlugins.dll"] = "4FCDA7C98D3184119BE57AB3E22B40889F48278C2504F29C35CF3E2497D306EC", + ["FlashIconHighlighter.dll"] = "6B2F76FD5943E4E328A1D042624E1766C92C5909C0BDC12D395582425D039A01", + ["GlassfishColumnizer.dll"] = "9AE2A91F3402B7FE138757495C05C61FCF1CB3D75D407881919A7296027C231F", + ["JsonColumnizer.dll"] = "55EB5FBAB7964B9295A49256D826AE3B803F77B8C44CC253F52F2F3393B8B38E", + ["JsonCompactColumnizer.dll"] = "AC66C875C48B5729660CAA2F60901AAD49DB81E90C19A8A43E808EE32789D7F7", + ["Log4jXmlColumnizer.dll"] = "B8C06431ED331CDBCD70678CA4C8976785B3828E16BC6EBF855DDBEB5AD36E49", + ["LogExpert.Resources.dll"] = "37B943E9A68108E3155CB885367E14D6B81E8721182F0BE880BFA161AF0DB668", ["Microsoft.Extensions.DependencyInjection.Abstractions.dll"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93", ["Microsoft.Extensions.DependencyInjection.Abstractions.dll (x86)"] = "67FA4325000DB017DC0C35829B416F024F042D24EFB868BCF17A895EE6500A93", ["Microsoft.Extensions.Logging.Abstractions.dll"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D", ["Microsoft.Extensions.Logging.Abstractions.dll (x86)"] = "BB853130F5AFAF335BE7858D661F8212EC653835100F5A4E3AA2C66A4D4F685D", - ["RegexColumnizer.dll"] = "817455920EEBDB247AF3B7EAE1F872AD95EB2A5CED728AE02687A386BA387FE0", - ["SftpFileSystem.dll"] = "BF1FE53D2A4ECF000718F67CCBA193BB670D859C6C2D449075C15C2F52812579", - ["SftpFileSystem.dll (x86)"] = "E1BAC2E86D11A768BF9750A269E9748CC24EA5FD59E52FEB508B9FFBFB8541D6", - ["SftpFileSystem.Resources.dll"] = "05CF7AAB99459310CA52A1C0C7675C44EAF64AEB852793F5A73DA8AE405E10B5", - ["SftpFileSystem.Resources.dll (x86)"] = "05CF7AAB99459310CA52A1C0C7675C44EAF64AEB852793F5A73DA8AE405E10B5", + ["RegexColumnizer.dll"] = "1014404A647FAF26CF19C9186E4BF5E1A17614A281B917C869DAB67C89B1BD66", + ["SftpFileSystem.dll"] = "ED6C05BA660754E4B466C129E52298A93309391B4E8944C0C5989F6820514EDF", + ["SftpFileSystem.dll (x86)"] = "F21802A8E877838D856E14D1D32535622623088FA59F6F141F43686531660D54", + ["SftpFileSystem.Resources.dll"] = "BD63A4CED4F31842A50BC28BC9DF4E813EFAD9305D64F8BF2546DC8C3A566413", + ["SftpFileSystem.Resources.dll (x86)"] = "BD63A4CED4F31842A50BC28BC9DF4E813EFAD9305D64F8BF2546DC8C3A566413", }; }