diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0092c8cd96c..3b3ef6ecd98d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -388,39 +388,39 @@ https://github.com/dotnet/runtime 29013d8ae50f5bc35427a9155234ccebfa5e227c - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb - + https://github.com/dotnet/arcade - 98b4ae348fa01b99dc6fbfc8f601efd9b90090db + 12fdb9fc3fe43a861f1ae01747bfe6cef878d4cb https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index ecc71f5eb2fa..9f9c0a6f8ff7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,11 +166,11 @@ 6.2.4 6.2.4 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 - 10.0.0-beta.25061.1 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 + 10.0.0-beta.25067.3 10.0.605604 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 853c63849626..80f9130b1508 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 84ab5f124acc..df203b517842 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 7d49350cb526..cf6af0c2721b 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "11.0.24" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25061.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25061.1", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25061.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25067.3", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25067.3", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25067.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" }