File tree Expand file tree Collapse file tree 4 files changed +18
-14
lines changed Expand file tree Collapse file tree 4 files changed +18
-14
lines changed Original file line number Diff line number Diff line change 309
309
<Uri >https://github.com/dotnet/runtime</Uri >
310
310
<Sha >72b7d236ad634c2280c73499ebfc2b594995ec06</Sha >
311
311
</Dependency >
312
- <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 6.0.0-beta.20573 .2" >
312
+ <Dependency Name =" Microsoft.DotNet.Arcade.Sdk" Version =" 6.0.0-beta.20601 .2" >
313
313
<Uri >https://github.com/dotnet/arcade</Uri >
314
- <Sha >35bddd4fbfab8da3518fb920250d7c9e0c3138ff </Sha >
314
+ <Sha >6d8efa00a7dd2d15e07df673a83cecb8a0a3031f </Sha >
315
315
</Dependency >
316
- <Dependency Name =" Microsoft.DotNet.Build.Tasks.Installers" Version =" 6.0.0-beta.20573 .2" >
316
+ <Dependency Name =" Microsoft.DotNet.Build.Tasks.Installers" Version =" 6.0.0-beta.20601 .2" >
317
317
<Uri >https://github.com/dotnet/arcade</Uri >
318
- <Sha >35bddd4fbfab8da3518fb920250d7c9e0c3138ff </Sha >
318
+ <Sha >6d8efa00a7dd2d15e07df673a83cecb8a0a3031f </Sha >
319
319
</Dependency >
320
- <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 6.0.0-beta.20573 .2" >
320
+ <Dependency Name =" Microsoft.DotNet.Helix.Sdk" Version =" 6.0.0-beta.20601 .2" >
321
321
<Uri >https://github.com/dotnet/arcade</Uri >
322
- <Sha >35bddd4fbfab8da3518fb920250d7c9e0c3138ff </Sha >
322
+ <Sha >6d8efa00a7dd2d15e07df673a83cecb8a0a3031f </Sha >
323
323
</Dependency >
324
324
</ToolsetDependencies >
325
325
</Dependencies >
Original file line number Diff line number Diff line change 141
141
<MicrosoftEntityFrameworkCoreVersion >6.0.0-alpha.1.20563.8</MicrosoftEntityFrameworkCoreVersion >
142
142
<MicrosoftEntityFrameworkCoreDesignVersion >6.0.0-alpha.1.20563.8</MicrosoftEntityFrameworkCoreDesignVersion >
143
143
<!-- Packages from dotnet/arcade -->
144
- <MicrosoftDotNetBuildTasksInstallersVersion >6.0.0-beta.20573 .2</MicrosoftDotNetBuildTasksInstallersVersion >
144
+ <MicrosoftDotNetBuildTasksInstallersVersion >6.0.0-beta.20601 .2</MicrosoftDotNetBuildTasksInstallersVersion >
145
145
</PropertyGroup >
146
146
<!--
147
147
Original file line number Diff line number Diff line change @@ -249,7 +249,7 @@ function with_retries {
249
249
return 0
250
250
fi
251
251
252
- timeout=$(( 2 ** $retries - 1 ))
252
+ timeout=$(( 3 ** $retries - 1 ))
253
253
echo " Failed to execute '$@ '. Waiting $timeout seconds before next attempt ($retries out of $maxRetries )." 1>&2
254
254
sleep $timeout
255
255
done
@@ -271,10 +271,14 @@ function GetDotNetInstallScript {
271
271
272
272
# Use curl if available, otherwise use wget
273
273
if command -v curl > /dev/null; then
274
- with_retries curl " $install_script_url " -sSL --retry 10 --create-dirs -o " $install_script " || {
275
- local exit_code=$?
276
- Write-PipelineTelemetryError -category ' InitializeToolset' " Failed to acquire dotnet install script (exit code '$exit_code ')."
277
- ExitWithExitCode $exit_code
274
+ # first, try directly, if this fails we will retry with verbose logging
275
+ curl " $install_script_url " -sSL --retry 10 --create-dirs -o " $install_script " || {
276
+ echo " curl failed; will now retry with verbose logging."
277
+ with_retries curl " $install_script_url " -sSL --verbose --retry 10 --create-dirs -o " $install_script " || {
278
+ local exit_code=$?
279
+ Write-PipelineTelemetryError -category ' InitializeToolset' " Failed to acquire dotnet install script (exit code '$exit_code ')."
280
+ ExitWithExitCode $exit_code
281
+ }
278
282
}
279
283
else
280
284
with_retries wget -v -O " $install_script " " $install_script_url " || {
Original file line number Diff line number Diff line change 30
30
},
31
31
"msbuild-sdks" : {
32
32
"Yarn.MSBuild" : " 1.15.2" ,
33
- "Microsoft.DotNet.Arcade.Sdk" : " 6.0.0-beta.20573 .2" ,
34
- "Microsoft.DotNet.Helix.Sdk" : " 6.0.0-beta.20573 .2"
33
+ "Microsoft.DotNet.Arcade.Sdk" : " 6.0.0-beta.20601 .2" ,
34
+ "Microsoft.DotNet.Helix.Sdk" : " 6.0.0-beta.20601 .2"
35
35
}
36
36
}
You can’t perform that action at this time.
0 commit comments