From 29993a2b1be9f5c56615282e08ad697b611e3460 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 13 Jul 2021 19:44:25 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20210709.3 (#11112)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
- XliffTasks: from 1.0.0-beta.21356.1 to 1.0.0-beta.21358.1 (parent: Microsoft.DotNet.Arcade.Sdk)
---
eng/Version.Details.xml | 12 ++++++------
eng/Versions.props | 2 +-
eng/common/tools.ps1 | 4 ++--
eng/common/tools.sh | 4 ++--
global.json | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 21ba8181d..6cad05ba0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -152,14 +152,14 @@
-
+
https://github.com/dotnet/arcade
- 286d98094b830b8dad769542b2669cb1b75f7097
+ 55262f114b0c1b82f0b081bca0d919b657ba24c5
-
+
https://github.com/dotnet/arcade
- 286d98094b830b8dad769542b2669cb1b75f7097
+ 55262f114b0c1b82f0b081bca0d919b657ba24c5
https://github.com/dotnet/source-build-reference-packages
@@ -175,9 +175,9 @@
4b584dbc392bb1aad49c2eb1ab84d8b489b6dccc
-
+
https://github.com/dotnet/xliff-tasks
- 68c1b83a228fc70d4b2e8f11954ab4883e1f5a77
+ 278d1810611250edf8095eab5ee6aa825fdb178a
diff --git a/eng/Versions.props b/eng/Versions.props
index 01101402e..b12c27f7e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -20,7 +20,7 @@
- 6.0.0-beta.21357.3
+ 6.0.0-beta.21359.3
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 4b2552032..2df090993 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 05ca99c6b..828119be4 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 c5e8c05fd..376a6ab24 100644
--- a/global.json
+++ b/global.json
@@ -11,7 +11,7 @@
"cmake": "3.16.4"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21357.3",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21359.3",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21253.2"
}
}