diff --git a/azure-pipelines-pr.yml b/azure-pipelines-pr.yml index 26161bcaf..071b49998 100644 --- a/azure-pipelines-pr.yml +++ b/azure-pipelines-pr.yml @@ -124,7 +124,7 @@ stages: XUnitPublishTargetFramework: net10.0 IncludeDotNetCli: true DotNetCliPackageType: sdk - DotNetCliVersion: 10.0.100-alpha.1.24573.1 + DotNetCliVersion: 10.0.100-alpha.1.25064.3 EnableXUnitReporter: true WaitForWorkItemCompletion: true HelixTargetQueues: Windows.Amd64.Server2022.Open;(Debian.12.Amd64.Open)Ubuntu.2204.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9af18764b..80eb13371 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -190,7 +190,7 @@ extends: XUnitPublishTargetFramework: net10.0 IncludeDotNetCli: true DotNetCliPackageType: sdk - DotNetCliVersion: 10.0.100-alpha.1.24573.1 + DotNetCliVersion: 10.0.100-alpha.1.25064.3 EnableXUnitReporter: true WaitForWorkItemCompletion: true HelixTargetQueues: Windows.Amd64.Server2022;(Debian.12.Amd64)Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-helix-amd64 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 071905d26..544f6bc36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ - + https://github.com/dotnet/arcade - 2696b08261fd0512213d484d790f47f8b989cef5 + fcbe4fd87a1c433d2d5a83b4fc7bbc414bcd81c9 - + https://github.com/dotnet/arcade - 2696b08261fd0512213d484d790f47f8b989cef5 + fcbe4fd87a1c433d2d5a83b4fc7bbc414bcd81c9 - + https://github.com/dotnet/arcade - 2696b08261fd0512213d484d790f47f8b989cef5 + fcbe4fd87a1c433d2d5a83b4fc7bbc414bcd81c9 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 853c63849..80f9130b1 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -42,7 +42,7 @@ [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1 +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' } # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -262,7 +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://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/dotnet-install.ps1" + $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 84ab5f124..df203b517 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true} use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -295,7 +295,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://raw.githubusercontent.com/dotnet/install-scripts/4b17227b30fbbad567d4d4fba17c59da51bc817b/src/dotnet-install.sh" + local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index 5dda2f3c9..3e006df5e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "10.0.100-alpha.1.24573.1", + "dotnet": "10.0.100-alpha.1.25064.3", "runtimes": { "dotnet": [ "2.1.30" @@ -8,7 +8,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25064.5", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25064.5" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25065.3", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25065.3" } }