From b44507884543867a2d07ff2df48ec8394798a769 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Nov 2023 13:23:23 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20231103.1 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.23528.2 -> To Version 9.0.0-beta.23553.1 --- eng/Version.Details.xml | 4 ++-- eng/common/tools.sh | 7 ++++++- global.json | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e5de0ef35d..0e74f6c4aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - bb2b4326ddf03d86c92bd125dba87e9d8df63463 + 1f067970472e5eb1877797bc4304dd13f284c7ba diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 710e64df96..e7ec245bc4 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 1b2037d477..049a0966ee 100644 --- a/global.json +++ b/global.json @@ -16,6 +16,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23528.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23553.1" } }