From 7c7934b5e38d9e29eedebfdc12a7c612bdc59e35 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 13 Jul 2021 12:36:10 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20210709.3 (#1114)
[main] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/common/tools.ps1 | 4 ++--
eng/common/tools.sh | 4 ++--
global.json | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4b8e2cf5..71a3ec27 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- 286d98094b830b8dad769542b2669cb1b75f7097
+ 55262f114b0c1b82f0b081bca0d919b657ba24c5
-
+
https://github.com/dotnet/arcade
- 286d98094b830b8dad769542b2669cb1b75f7097
+ 55262f114b0c1b82f0b081bca0d919b657ba24c5
-
+
https://github.com/dotnet/arcade
- 286d98094b830b8dad769542b2669cb1b75f7097
+ 55262f114b0c1b82f0b081bca0d919b657ba24c5
-
+
https://github.com/dotnet/arcade
- 286d98094b830b8dad769542b2669cb1b75f7097
+ 55262f114b0c1b82f0b081bca0d919b657ba24c5
-
+
https://github.com/dotnet/arcade
- 286d98094b830b8dad769542b2669cb1b75f7097
+ 55262f114b0c1b82f0b081bca0d919b657ba24c5
https://github.com/dotnet/arcade-services
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 4b255203..2df09099 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://dot.net/v1/dotnet-install.ps1
+# default URL: https://dotnet.microsoft.com/download/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.
@@ -223,7 +223,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://dot.net/$dotnetInstallScriptVersion/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 05ca99c6..828119be 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://dot.net/v1/dotnet-install.sh
+# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -262,7 +262,7 @@ function with_retries {
function GetDotNetInstallScript {
local root=$1
local install_script="$root/dotnet-install.sh"
- local install_script_url="https://dot.net/$dotnetInstallScriptVersion/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 79f028dd..c702054b 100644
--- a/global.json
+++ b/global.json
@@ -11,6 +11,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21357.3"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21359.3"
}
}