implement PR to fix .net issue in newer runners

manually merge in this PR to fix my runners vrchat-community#28
Happyrobot33 · Oct 14, 2024 · ef833e8 · ef833e8
1 parent b4b9d36
commit ef833e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/PackageBuilder/PackageBuilder.csproj b/PackageBuilder/PackageBuilder.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..</NukeRootDirectory>

diff --git a/build.sh b/build.sh
@@ -56,7 +56,13 @@ else
     export DOTNET_EXE="$DOTNET_DIRECTORY/dotnet"
 fi
 
+FRAMEWORK="net6.0"
+if dotnet --list-sdks | grep ^8 > /dev/null; then
+  FRAMEWORK="net8.0"
+fi
+
 echo "Microsoft (R) .NET Core SDK version $("$DOTNET_EXE" --version)"
+echo "Using Framework $FRAMEWORK"
 
 "$DOTNET_EXE" build "$BUILD_PROJECT_FILE" /nodeReuse:false /p:UseSharedCompilation=false -nologo -clp:NoSummary --verbosity quiet
-"$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build -- "$@"
+"$DOTNET_EXE" run --project "$BUILD_PROJECT_FILE" --no-build --framework "$FRAMEWORK" -- "$@"