From e54df54db0a46577a41b269cd120cb013bf8f1e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 10:57:19 +0530 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20241226.1 (#10207) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.24623.1 -> To Version 10.0.0-beta.24626.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/common/tools.ps1 | 4 +--- eng/common/tools.sh | 4 +--- global.json | 4 ++-- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5234930f61..9f48f90efad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -165,25 +165,25 @@ - + https://github.com/dotnet/arcade - ae0923d109be7ddf2a5d99e3bf685f72132edeaf + ae8d2a08f1021624ae37cdd5b65f6c05e58a051b - + https://github.com/dotnet/arcade - ae0923d109be7ddf2a5d99e3bf685f72132edeaf + ae8d2a08f1021624ae37cdd5b65f6c05e58a051b - + https://github.com/dotnet/arcade - ae0923d109be7ddf2a5d99e3bf685f72132edeaf + ae8d2a08f1021624ae37cdd5b65f6c05e58a051b https://github.com/dotnet/arcade f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - ae0923d109be7ddf2a5d99e3bf685f72132edeaf + ae8d2a08f1021624ae37cdd5b65f6c05e58a051b https://github.com/dotnet/sourcelink diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 4030f225188..04b02f4fd3c 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 4c59c7710d9..40485a0f59d 100644 --- 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 89c61bcda62..e167ce6a3c6 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24623.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24623.1" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24626.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24626.1" }, "sdk": { "version": "10.0.100-alpha.1.24573.1"