diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d09d550..1d05a529 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - aa96cf38432123dc5de1a2ad877e3ff6b079c928 + 215ead44de53294bc1223b593a36bda5493df4ba - + https://github.com/dotnet/arcade - aa96cf38432123dc5de1a2ad877e3ff6b079c928 + 215ead44de53294bc1223b593a36bda5493df4ba - + https://github.com/dotnet/arcade - aa96cf38432123dc5de1a2ad877e3ff6b079c928 + 215ead44de53294bc1223b593a36bda5493df4ba - + https://github.com/dotnet/arcade - aa96cf38432123dc5de1a2ad877e3ff6b079c928 + 215ead44de53294bc1223b593a36bda5493df4ba - + https://github.com/dotnet/arcade - aa96cf38432123dc5de1a2ad877e3ff6b079c928 + 215ead44de53294bc1223b593a36bda5493df4ba https://github.com/dotnet/arcade-services diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 710e64df..e7ec245b 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -341,7 +341,12 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" - _InitializeBuildToolFramework="net8.0" + # use override if it exists - commonly set by source-build + if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then + _InitializeBuildToolFramework="net8.0" + else + _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" + fi } # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 diff --git a/global.json b/global.json index 0a4e8f7c..aabae6f4 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23551.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23552.4" } }