From 113fff4f35b959f8595f2601f243041e4eb2dbc1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 3 Dec 2020 13:35:08 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
build 20201201.2 (#840)
[master] Update dependencies from dotnet/arcade
---
eng/Version.Details.xml | 20 ++++++++++----------
eng/common/tools.sh | 14 +++++++++-----
global.json | 2 +-
3 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 5e105a26..61ddd622 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,25 +3,25 @@
-
+
https://github.com/dotnet/arcade
- 35bddd4fbfab8da3518fb920250d7c9e0c3138ff
+ 6d8efa00a7dd2d15e07df673a83cecb8a0a3031f
-
+
https://github.com/dotnet/arcade
- 35bddd4fbfab8da3518fb920250d7c9e0c3138ff
+ 6d8efa00a7dd2d15e07df673a83cecb8a0a3031f
-
+
https://github.com/dotnet/arcade
- 35bddd4fbfab8da3518fb920250d7c9e0c3138ff
+ 6d8efa00a7dd2d15e07df673a83cecb8a0a3031f
-
+
https://github.com/dotnet/arcade
- 35bddd4fbfab8da3518fb920250d7c9e0c3138ff
+ 6d8efa00a7dd2d15e07df673a83cecb8a0a3031f
-
+
https://github.com/dotnet/arcade
- 35bddd4fbfab8da3518fb920250d7c9e0c3138ff
+ 6d8efa00a7dd2d15e07df673a83cecb8a0a3031f
https://github.com/dotnet/arcade-services
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 98186e78..87152724 100755
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@@ -249,7 +249,7 @@ function with_retries {
return 0
fi
- timeout=$((2**$retries-1))
+ timeout=$((3**$retries-1))
echo "Failed to execute '$@'. Waiting $timeout seconds before next attempt ($retries out of $maxRetries)." 1>&2
sleep $timeout
done
@@ -271,10 +271,14 @@ function GetDotNetInstallScript {
# Use curl if available, otherwise use wget
if command -v curl > /dev/null; then
- with_retries curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
- local exit_code=$?
- Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
- ExitWithExitCode $exit_code
+ # 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."
+ 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')."
+ ExitWithExitCode $exit_code
+ }
}
else
with_retries wget -v -O "$install_script" "$install_script_url" || {
diff --git a/global.json b/global.json
index 8f3a391c..ce3c8fac 100644
--- a/global.json
+++ b/global.json
@@ -11,6 +11,6 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20573.2"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20601.2"
}
}