From 7b0ba966b82b711693916ffd2bffd470f3bf46c5 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 31 Dec 2020 13:27:17 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20201230.2 (#3939)
[master] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/Versions.props | 6 +++---
eng/common/tools.sh | 4 +++-
global.json | 4 ++--
4 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ab2696021..569c02400 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -99,25 +99,25 @@
-
+
https://github.com/dotnet/arcade
- 7e0f9bc02f83d0a561d9edb963d856334f048f0d
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 7e0f9bc02f83d0a561d9edb963d856334f048f0d
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 7e0f9bc02f83d0a561d9edb963d856334f048f0d
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 7e0f9bc02f83d0a561d9edb963d856334f048f0d
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
-
+
https://github.com/dotnet/arcade
- 7e0f9bc02f83d0a561d9edb963d856334f048f0d
+ 4c8515c18ebe0071c32fed467ee3890fbd488898
diff --git a/eng/Versions.props b/eng/Versions.props
index cd612a590..f75a0c02f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -43,9 +43,9 @@
- 6.0.0-beta.20623.1
- 6.0.0-beta.20623.1
- 6.0.0-beta.20623.1
+ 6.0.0-beta.20630.2
+ 6.0.0-beta.20630.2
+ 6.0.0-beta.20630.2
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 0295dd9ff..b160c370f 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -273,7 +273,9 @@ function GetDotNetInstallScript {
if command -v curl > /dev/null; then
# first, try directly, if this fails we will retry with verbose logging
curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
- echo "curl failed; will now retry with verbose logging."
+ echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation"
+ echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443
+ echo "Will now retry the same URL with verbose logging."
with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || {
local exit_code=$?
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
diff --git a/global.json b/global.json
index 10ce8ff2f..2ad964a55 100644
--- a/global.json
+++ b/global.json
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20623.1",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20623.1"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20630.2",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20630.2"
},
"sdk": {
"version": "5.0.100"
--
GitLab