diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfaeb13a5b712..ad7a5d9cdb45b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,82 +107,82 @@ - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 https://github.com/dotnet/runtime-assets @@ -329,9 +329,9 @@ https://github.com/dotnet/xharness e74a52e487efdf4f1dfcb7540abf5dd529ce2e4e - + https://github.com/dotnet/arcade - 16a344fc2ff2eecac5b03b88c96e99d7796e5125 + f2ad2b48b7426e77e19902068b3aa38476073ab1 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 87ad8ac53b2f6..e79a6d8b2e1f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,22 +82,22 @@ 9.0.100-alpha.1.23551.3 - 9.0.0-beta.23531.4 - 9.0.0-beta.23531.4 - 9.0.0-beta.23531.4 - 9.0.0-beta.23531.4 - 9.0.0-beta.23531.4 - 9.0.0-beta.23531.4 - 2.5.3-beta.23531.4 - 9.0.0-beta.23531.4 - 9.0.0-beta.23531.4 - 9.0.0-beta.23531.4 - 9.0.0-beta.23531.4 - 9.0.0-beta.23531.4 - 9.0.0-beta.23531.4 - 9.0.0-beta.23531.4 - 9.0.0-beta.23531.4 - 9.0.0-beta.23531.4 + 9.0.0-beta.23558.3 + 9.0.0-beta.23558.3 + 9.0.0-beta.23558.3 + 9.0.0-beta.23558.3 + 9.0.0-beta.23558.3 + 9.0.0-beta.23558.3 + 2.5.3-beta.23558.3 + 9.0.0-beta.23558.3 + 9.0.0-beta.23558.3 + 9.0.0-beta.23558.3 + 9.0.0-beta.23558.3 + 9.0.0-beta.23558.3 + 9.0.0-beta.23558.3 + 9.0.0-beta.23558.3 + 9.0.0-beta.23558.3 + 9.0.0-beta.23558.3 6.0.0-preview.1.102 diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 710e64df967fd..e98daf50c6b67 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -310,7 +310,7 @@ function GetDotNetInstallScript { curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || { if command -v openssl &> /dev/null; then echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation" - echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443 + echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443 || true fi echo "Will now retry the same URL with verbose logging." with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || { @@ -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 22108bd5df1fe..dcf6b3757af1c 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-rtm.23506.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23531.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23531.4", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23531.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23558.3", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23558.3", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23558.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23529.4"