diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3314e7204..f7b4e3f11 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -202,18 +202,18 @@ - + 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 @@ -223,9 +223,9 @@ https://github.com/dotnet/arcade-services f7d6c1e3aa9f78f08aa0647f5cdf5d0178cc1a5c - + https://github.com/dotnet/arcade - aa96cf38432123dc5de1a2ad877e3ff6b079c928 + 215ead44de53294bc1223b593a36bda5493df4ba https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2da8a3531..2b80e5d0e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.23551.1 + 9.0.0-beta.23552.4 diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 710e64df9..e7ec245bc 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 6308e5d60..9c2128c81 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23551.1", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23551.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23552.4", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23552.4" } }