diff --git a/BinaryObjectScanner/BinaryObjectScanner.csproj b/BinaryObjectScanner/BinaryObjectScanner.csproj index 3e0c2451..580ab886 100644 --- a/BinaryObjectScanner/BinaryObjectScanner.csproj +++ b/BinaryObjectScanner/BinaryObjectScanner.csproj @@ -3,7 +3,7 @@ net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 - win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64 + win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64 true false latest diff --git a/Test/Test.csproj b/Test/Test.csproj index 72fcfc57..92810e15 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -2,7 +2,7 @@ net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 - win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64 + win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64 Exe false latest diff --git a/publish-nix.sh b/publish-nix.sh index 52194f62..82c1913e 100644 --- a/publish-nix.sh +++ b/publish-nix.sh @@ -73,6 +73,12 @@ then do for RUNTIME in "${RUNTIMES[@]}" do + # If we have an invalid combination of framework and runtime + if [ ! $(echo ${VALID_CROSS_PLATFORM_FRAMEWORKS[@]} | fgrep -w $FRAMEWORK) ] && [ $(echo ${VALID_CROSS_PLATFORM_RUNTIMES[@]} | fgrep -w $RUNTIME) ] + then + continue + fi + # Only .NET 5 and above can publish to a single file if [[ $(echo ${SINGLE_FILE_CAPABLE[@]} | fgrep -w $FRAMEWORK) ]] then diff --git a/publish-win.ps1 b/publish-win.ps1 index 8e14550e..50952bf6 100644 --- a/publish-win.ps1 +++ b/publish-win.ps1 @@ -62,6 +62,12 @@ if (!$NO_BUILD.IsPresent) { foreach ($RUNTIME in $RUNTIMES) { + # If we have an invalid combination of framework and runtime + if ($VALID_CROSS_PLATFORM_FRAMEWORKS -notcontains $FRAMEWORK -and $VALID_CROSS_PLATFORM_RUNTIMES -contains $RUNTIME) + { + continue + } + # Only .NET 5 and above can publish to a single file if ($SINGLE_FILE_CAPABLE -contains $FRAMEWORK) {