Skip to content

Commit 0ace31c

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20201201.2 (#28474)
[master] Update dependencies from dotnet/arcade
1 parent cfc43b3 commit 0ace31c

File tree

4 files changed

+18
-14
lines changed

4 files changed

+18
-14
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -309,17 +309,17 @@
309309
<Uri>https://github.com/dotnet/runtime</Uri>
310310
<Sha>72b7d236ad634c2280c73499ebfc2b594995ec06</Sha>
311311
</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">
313313
<Uri>https://github.com/dotnet/arcade</Uri>
314-
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
314+
<Sha>6d8efa00a7dd2d15e07df673a83cecb8a0a3031f</Sha>
315315
</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">
317317
<Uri>https://github.com/dotnet/arcade</Uri>
318-
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
318+
<Sha>6d8efa00a7dd2d15e07df673a83cecb8a0a3031f</Sha>
319319
</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">
321321
<Uri>https://github.com/dotnet/arcade</Uri>
322-
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
322+
<Sha>6d8efa00a7dd2d15e07df673a83cecb8a0a3031f</Sha>
323323
</Dependency>
324324
</ToolsetDependencies>
325325
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<MicrosoftEntityFrameworkCoreVersion>6.0.0-alpha.1.20563.8</MicrosoftEntityFrameworkCoreVersion>
142142
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-alpha.1.20563.8</MicrosoftEntityFrameworkCoreDesignVersion>
143143
<!-- Packages from dotnet/arcade -->
144-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.20573.2</MicrosoftDotNetBuildTasksInstallersVersion>
144+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.20601.2</MicrosoftDotNetBuildTasksInstallersVersion>
145145
</PropertyGroup>
146146
<!--
147147

eng/common/tools.sh

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ function with_retries {
249249
return 0
250250
fi
251251

252-
timeout=$((2**$retries-1))
252+
timeout=$((3**$retries-1))
253253
echo "Failed to execute '$@'. Waiting $timeout seconds before next attempt ($retries out of $maxRetries)." 1>&2
254254
sleep $timeout
255255
done
@@ -271,10 +271,14 @@ function GetDotNetInstallScript {
271271

272272
# Use curl if available, otherwise use wget
273273
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+
}
278282
}
279283
else
280284
with_retries wget -v -O "$install_script" "$install_script_url" || {

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
},
3131
"msbuild-sdks": {
3232
"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"
3535
}
3636
}

0 commit comments

Comments
 (0)