diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 93aecf540..2ca5d9366 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
-
+
https://github.com/dotnet/arcade
- 35bddd4fbfab8da3518fb920250d7c9e0c3138ff
+ 6d8efa00a7dd2d15e07df673a83cecb8a0a3031f
diff --git a/eng/common/tools.sh b/eng/common/tools.sh
index 98186e784..871527241 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 87e9dc764..e22d97339 100644
--- a/global.json
+++ b/global.json
@@ -17,6 +17,6 @@
"xcopy-msbuild": "16.8.0-preview2.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20573.2"
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20601.2"
}
}