From e7e4845885795ea8f08c997abadeee554524d9be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 Dec 2024 05:02:34 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20241226.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.24623.1 -> To Version 10.0.0-beta.24626.1 --- eng/Version.Details.xml | 4 ++-- eng/common/tools.ps1 | 4 +--- eng/common/tools.sh | 4 +--- global.json | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24d937e48..19b8b3553 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/arcade - ae0923d109be7ddf2a5d99e3bf685f72132edeaf + ae8d2a08f1021624ae37cdd5b65f6c05e58a051b diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 4030f2251..04b02f4fd 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -262,9 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - # $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" - # Pre-flighting new install script - $uri = "https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.ps1" + $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 4c59c7710..40485a0f5 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -295,9 +295,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - # local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" - # Pre-flight install script - local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/fe7622c52c1ed67871a8d2ad9e794be9be7eea01/src/dotnet-install.sh" + local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index 67ae60544..ebe4207d5 100644 --- a/global.json +++ b/global.json @@ -8,7 +8,7 @@ "dotnet": "10.0.100-alpha.1.24573.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24623.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24626.1", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23607.2" } }