From e75fdcab523a7421475c4e5b7b5ff6f0606d9e73 Mon Sep 17 00:00:00 2001 From: Kevin Jones Date: Thu, 12 Nov 2026 11:35:54 -0500 Subject: [PATCH 1/2] Update for .NET 11 --- .github/workflows/pr.yml | 2 +- Directory.Packages.props | 19 ++++++++----------- global.json | 5 +++++ src/AzureSign.Core/AzureSign.Core.csproj | 4 ++-- src/AzureSignTool/AzureSignTool.csproj | 6 +----- .../AzureSign.Core.Tests.csproj | 12 ++++-------- .../AzureSignTool.Tests.csproj | 12 ++++-------- 7 files changed, 25 insertions(+), 35 deletions(-) create mode 100644 global.json diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0b315bf..27280d7 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -17,7 +17,7 @@ jobs: name: Checkout - uses: actions/setup-dotnet@v6 with: - dotnet-version: '10.0' + dotnet-version: '11.0' - run: dotnet test dependency-review: diff --git a/Directory.Packages.props b/Directory.Packages.props index a4a641b..ec706b2 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -1,22 +1,19 @@ - - - - - - + + + + + - + - + - - - + diff --git a/global.json b/global.json new file mode 100644 index 0000000..3140116 --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "test": { + "runner": "Microsoft.Testing.Platform" + } +} diff --git a/src/AzureSign.Core/AzureSign.Core.csproj b/src/AzureSign.Core/AzureSign.Core.csproj index a686c2a..807e845 100644 --- a/src/AzureSign.Core/AzureSign.Core.csproj +++ b/src/AzureSign.Core/AzureSign.Core.csproj @@ -1,13 +1,13 @@ - netstandard2.0;net8.0 + netstandard2.0;net10.0 Authenticode signing library. true true v enable - true + true true true MIT diff --git a/src/AzureSignTool/AzureSignTool.csproj b/src/AzureSignTool/AzureSignTool.csproj index 5d91182..e79c1ea 100644 --- a/src/AzureSignTool/AzureSignTool.csproj +++ b/src/AzureSignTool/AzureSignTool.csproj @@ -2,7 +2,7 @@ Exe - net8.0;net10.0 + net10.0;net11.0 true azuresigntool Azure Sign Tool is similar to signtool in the Windows SDK, with the major difference being that it uses Azure Key Vault for performing the signing process. The usage is like signtool, except with a limited set of options for signing and options for authenticating to Azure Key Vault. @@ -29,10 +29,6 @@ - - - - diff --git a/test/AzureSign.Core.Tests/AzureSign.Core.Tests.csproj b/test/AzureSign.Core.Tests/AzureSign.Core.Tests.csproj index e2dbff8..c9abd00 100644 --- a/test/AzureSign.Core.Tests/AzureSign.Core.Tests.csproj +++ b/test/AzureSign.Core.Tests/AzureSign.Core.Tests.csproj @@ -1,18 +1,14 @@ - net10.0 - + net11.0 + true false + Exe - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/test/AzureSignTool.Tests/AzureSignTool.Tests.csproj b/test/AzureSignTool.Tests/AzureSignTool.Tests.csproj index 41d48f4..1b6e857 100644 --- a/test/AzureSignTool.Tests/AzureSignTool.Tests.csproj +++ b/test/AzureSignTool.Tests/AzureSignTool.Tests.csproj @@ -1,18 +1,14 @@ - net10.0 - + net11.0 + true false + Exe - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + From ff355908d4c845484f426de1bd444b99e7f3f896 Mon Sep 17 00:00:00 2001 From: Kevin Jones Date: Thu, 12 Nov 2026 11:46:39 -0500 Subject: [PATCH 2/2] fix build script versions --- build/build.ps1 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/build.ps1 b/build/build.ps1 index fc7c6f6..4377acc 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -61,13 +61,13 @@ Expand-Archive -Path $objDir\AzureSignTool.nupkg -DestinationPath $objDir\AzureS Remove-Item -Path $objDir\AzureSign.Core.nupkg Remove-Item -Path $objDir\AzureSignTool.nupkg -& "$sdkBinPath\signtool.exe" sign /d "AzureSign.Core" /sha1 73f0844a95e35441a676cd6be1e79a3cd51d00b4 /fd SHA384 /td SHA384 /tr "http://timestamp.digicert.com" /du "https://github.com/vcsjones/AzureSignTool" "$objDir\AzureSign.Core.nupkg.dir\lib\net8.0\AzureSign.Core.dll" +& "$sdkBinPath\signtool.exe" sign /d "AzureSign.Core" /sha1 73f0844a95e35441a676cd6be1e79a3cd51d00b4 /fd SHA384 /td SHA384 /tr "http://timestamp.digicert.com" /du "https://github.com/vcsjones/AzureSignTool" "$objDir\AzureSign.Core.nupkg.dir\lib\net10.0\AzureSign.Core.dll" & "$sdkBinPath\signtool.exe" sign /d "AzureSign.Core" /sha1 73f0844a95e35441a676cd6be1e79a3cd51d00b4 /fd SHA384 /td SHA384 /tr "http://timestamp.digicert.com" /du "https://github.com/vcsjones/AzureSignTool" "$objDir\AzureSign.Core.nupkg.dir\lib\netstandard2.0\AzureSign.Core.dll" -& "$sdkBinPath\signtool.exe" sign /d "AzureSignTool" /sha1 73f0844a95e35441a676cd6be1e79a3cd51d00b4 /fd SHA384 /td SHA384 /tr "http://timestamp.digicert.com" /du "https://github.com/vcsjones/AzureSignTool" "$objDir\AzureSignTool.nupkg.dir\tools\net8.0\any\AzureSignTool.dll" & "$sdkBinPath\signtool.exe" sign /d "AzureSignTool" /sha1 73f0844a95e35441a676cd6be1e79a3cd51d00b4 /fd SHA384 /td SHA384 /tr "http://timestamp.digicert.com" /du "https://github.com/vcsjones/AzureSignTool" "$objDir\AzureSignTool.nupkg.dir\tools\net10.0\any\AzureSignTool.dll" +& "$sdkBinPath\signtool.exe" sign /d "AzureSignTool" /sha1 73f0844a95e35441a676cd6be1e79a3cd51d00b4 /fd SHA384 /td SHA384 /tr "http://timestamp.digicert.com" /du "https://github.com/vcsjones/AzureSignTool" "$objDir\AzureSignTool.nupkg.dir\tools\net11.0\any\AzureSignTool.dll" -Copy-Item -Path "$objDir\AzureSign.Core.nupkg.dir\lib\net8.0\AzureSign.Core.dll" -Destination "$objDir\AzureSignTool.nupkg.dir\tools\net8.0\any\AzureSign.Core.dll" -Copy-Item -Path "$objDir\AzureSign.Core.nupkg.dir\lib\net8.0\AzureSign.Core.dll" -Destination "$objDir\AzureSignTool.nupkg.dir\tools\net10.0\any\AzureSign.Core.dll" +Copy-Item -Path "$objDir\AzureSign.Core.nupkg.dir\lib\net10.0\AzureSign.Core.dll" -Destination "$objDir\AzureSignTool.nupkg.dir\tools\net10.0\any\AzureSign.Core.dll" +Copy-Item -Path "$objDir\AzureSign.Core.nupkg.dir\lib\net10.0\AzureSign.Core.dll" -Destination "$objDir\AzureSignTool.nupkg.dir\tools\net11.0\any\AzureSign.Core.dll" Compress-Archive -Path "$objDir\AzureSign.Core.nupkg.dir\*" -DestinationPath "$objDir\AzureSign.Core.nupkg" Compress-Archive -Path "$objDir\AzureSignTool.nupkg.dir\*" -DestinationPath "$objDir\AzureSignTool.nupkg" @@ -78,8 +78,8 @@ dotnet nuget sign --certificate-fingerprint 68821304869e065c24e0684eb43bf974e124 Copy-Item -Path "$objDir\AzureSign.Core.nupkg" -Destination "$outDir\AzureSign.Core.nupkg" Copy-Item -Path "$objDir\AzureSignTool.nupkg" -Destination "$outDir\AzureSignTool.nupkg" -dotnet publish -f net10.0 -c Release -r win-arm64 -p:ContinuousIntegrationBuild=true -o "$objDir\AzureSignTool-arm64" .\src\AzureSignTool\AzureSignTool.csproj -dotnet publish -f net10.0 -c Release -r win-x64 -p:ContinuousIntegrationBuild=true -o "$objDir\AzureSignTool-x64" .\src\AzureSignTool\AzureSignTool.csproj +dotnet publish -f net11.0 -c Release -r win-arm64 -p:ContinuousIntegrationBuild=true -o "$objDir\AzureSignTool-arm64" .\src\AzureSignTool\AzureSignTool.csproj +dotnet publish -f net11.0 -c Release -r win-x64 -p:ContinuousIntegrationBuild=true -o "$objDir\AzureSignTool-x64" .\src\AzureSignTool\AzureSignTool.csproj & "$sdkBinPath\signtool.exe" sign /d "AzureSignTool" /sha1 73f0844a95e35441a676cd6be1e79a3cd51d00b4 /fd SHA384 /td SHA384 /tr "http://timestamp.digicert.com" /du "https://github.com/vcsjones/AzureSignTool" "$objDir\AzureSignTool-x64\AzureSignTool.exe" & "$sdkBinPath\signtool.exe" sign /d "AzureSignTool" /sha1 73f0844a95e35441a676cd6be1e79a3cd51d00b4 /fd SHA384 /td SHA384 /tr "http://timestamp.digicert.com" /du "https://github.com/vcsjones/AzureSignTool" "$objDir\AzureSignTool-arm64\AzureSignTool.exe" @@ -87,4 +87,4 @@ dotnet publish -f net10.0 -c Release -r win-x64 -p:ContinuousIntegrationBuild=tr Copy-Item -Path "$objDir\AzureSignTool-x64\AzureSignTool.exe" -Destination "$outDir\AzureSignTool-x64.exe" Copy-Item -Path "$objDir\AzureSignTool-arm64\AzureSignTool.exe" -Destination "$outDir\AzureSignTool-arm64.exe" -popd \ No newline at end of file +popd