From 2ed4418415caa2b3c135e70f9eae282e7e27e32f Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Wed, 11 Nov 2026 18:56:35 +0100 Subject: [PATCH] Add .NET 11 support --- .github/workflows/build_and_test.yml | 1 + .github/workflows/check_pr.yml | 1 + .vscode/launch.json | 2 +- .../BinaryObjectScanner.Test.csproj | 11 ++++++----- BinaryObjectScanner/BinaryObjectScanner.csproj | 16 ++++++++-------- ProtectionScan/ProtectionScan.csproj | 10 +++++----- publish-nix.sh | 12 ++++++------ publish-win.ps1 | 12 ++++++------ 8 files changed, 34 insertions(+), 31 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 1eca5c30..29da97ea 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -20,6 +20,7 @@ jobs: 8.0.x 9.0.x 10.0.x + 11.0.x - name: Run tests run: dotnet test diff --git a/.github/workflows/check_pr.yml b/.github/workflows/check_pr.yml index 5e7ba34d..1205f66d 100644 --- a/.github/workflows/check_pr.yml +++ b/.github/workflows/check_pr.yml @@ -15,6 +15,7 @@ jobs: 8.0.x 9.0.x 10.0.x + 11.0.x - name: Build run: dotnet build diff --git a/.vscode/launch.json b/.vscode/launch.json index aef77e8e..3652a47d 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,7 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/ProtectionScan/bin/Debug/net10.0/ProtectionScan.dll", + "program": "${workspaceFolder}/ProtectionScan/bin/Debug/net11.0/ProtectionScan.dll", "args": [], "cwd": "${workspaceFolder}/ProtectionScan", // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console diff --git a/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj b/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj index 34635e16..0f821d1e 100644 --- a/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj +++ b/BinaryObjectScanner.Test/BinaryObjectScanner.Test.csproj @@ -1,10 +1,11 @@ - net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0;net11.0 false latest enable + true @@ -12,14 +13,14 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj index a4f10e5a..c3ef1ae1 100644 --- a/BinaryObjectScanner/BinaryObjectScanner.csproj +++ b/BinaryObjectScanner/BinaryObjectScanner.csproj @@ -2,7 +2,7 @@ - net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0;netstandard2.0;netstandard2.1 + net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0;netstandard2.0;netstandard2.1 true false false @@ -34,11 +34,11 @@ win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64 - + win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64 - net6.0;net7.0;net8.0;net9.0;net10.0 + net6.0;net7.0;net8.0;net9.0;net10.0;net11.0 @@ -50,12 +50,12 @@ - + - - - - + + + + \ No newline at end of file diff --git a/ProtectionScan/ProtectionScan.csproj b/ProtectionScan/ProtectionScan.csproj index 65da01ba..4cf0e7e4 100644 --- a/ProtectionScan/ProtectionScan.csproj +++ b/ProtectionScan/ProtectionScan.csproj @@ -1,7 +1,7 @@ - net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0 + net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;net10.0;net11.0 Exe false true @@ -20,11 +20,11 @@ win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64 - + win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64 - net6.0;net7.0;net8.0;net9.0;net10.0 + net6.0;net7.0;net8.0;net9.0;net10.0;net11.0 @@ -32,8 +32,8 @@ - - + + \ No newline at end of file diff --git a/publish-nix.sh b/publish-nix.sh index 55e20efe..ef0654ec 100755 --- a/publish-nix.sh +++ b/publish-nix.sh @@ -1,7 +1,7 @@ #!/bin/bash # This batch file assumes the following: -# - .NET 10.0 (or newer) SDK is installed and in PATH +# - .NET 11.0 (or newer) SDK is installed and in PATH # - zip is installed and in PATH # - Git is installed and in PATH # @@ -56,18 +56,18 @@ echo " Version (-v) $HAS_VERSION ($VERSION)" echo " " # Create the build matrix arrays -FRAMEWORKS=("net10.0") +FRAMEWORKS=("net11.0") RUNTIMES=("win-x86" "win-x64" "win-arm64" "linux-x64" "linux-arm64" "osx-x64" "osx-arm64") # Use expanded lists, if requested if [ $USE_ALL = true ]; then - FRAMEWORKS=("net20" "net35" "net40" "net452" "net462" "net472" "net48" "netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0" "net9.0" "net10.0") + FRAMEWORKS=("net20" "net35" "net40" "net452" "net462" "net472" "net48" "netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0" "net9.0" "net10.0" "net11.0") fi # Create the filter arrays -SINGLE_FILE_CAPABLE=("net5.0" "net6.0" "net7.0" "net8.0" "net9.0" "net10.0") -VALID_APPLE_FRAMEWORKS=("net6.0" "net7.0" "net8.0" "net9.0" "net10.0") -VALID_CROSS_PLATFORM_FRAMEWORKS=("netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0" "net9.0" "net10.0") +SINGLE_FILE_CAPABLE=("net5.0" "net6.0" "net7.0" "net8.0" "net9.0" "net10.0" "net11.0") +VALID_APPLE_FRAMEWORKS=("net6.0" "net7.0" "net8.0" "net9.0" "net10.0" "net11.0") +VALID_CROSS_PLATFORM_FRAMEWORKS=("netcoreapp3.1" "net5.0" "net6.0" "net7.0" "net8.0" "net9.0" "net10.0" "net11.0") VALID_CROSS_PLATFORM_RUNTIMES=("win-arm64" "linux-x64" "linux-arm64" "osx-x64" "osx-arm64") # Only build if requested diff --git a/publish-win.ps1 b/publish-win.ps1 index 88410210..7f33956b 100644 --- a/publish-win.ps1 +++ b/publish-win.ps1 @@ -1,5 +1,5 @@ # This batch file assumes the following: -# - .NET 10.0 (or newer) SDK is installed and in PATH +# - .NET 11.0 (or newer) SDK is installed and in PATH # - 7-zip commandline (7z.exe) is installed and in PATH # - Git for Windows is installed and in PATH # @@ -45,18 +45,18 @@ Write-Host " Version (-BuildVersion) $BUILD_VERSION" Write-Host " " # Create the build matrix arrays -$FRAMEWORKS = @('net10.0') +$FRAMEWORKS = @('net11.0') $RUNTIMES = @('win-x86', 'win-x64', 'win-arm64', 'linux-x64', 'linux-arm64', 'osx-x64', 'osx-arm64') # Use expanded lists, if requested if ($USE_ALL.IsPresent) { - $FRAMEWORKS = @('net20', 'net35', 'net40', 'net452', 'net462', 'net472', 'net48', 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0', 'net10.0') + $FRAMEWORKS = @('net20', 'net35', 'net40', 'net452', 'net462', 'net472', 'net48', 'netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0', 'net10.0', 'net11.0') } # Create the filter arrays -$SINGLE_FILE_CAPABLE = @('net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0', 'net10.0') -$VALID_APPLE_FRAMEWORKS = @('net6.0', 'net7.0', 'net8.0', 'net9.0', 'net10.0') -$VALID_CROSS_PLATFORM_FRAMEWORKS = @('netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0', 'net10.0') +$SINGLE_FILE_CAPABLE = @('net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0', 'net10.0', 'net11.0') +$VALID_APPLE_FRAMEWORKS = @('net6.0', 'net7.0', 'net8.0', 'net9.0', 'net10.0', 'net11.0') +$VALID_CROSS_PLATFORM_FRAMEWORKS = @('netcoreapp3.1', 'net5.0', 'net6.0', 'net7.0', 'net8.0', 'net9.0', 'net10.0', 'net11.0') $VALID_CROSS_PLATFORM_RUNTIMES = @('win-arm64', 'linux-x64', 'linux-arm64', 'osx-x64', 'osx-arm64') # Only build if requested