Skip to content

Commit 2f30b18

Browse files
dotnet-maestro[bot]colombod
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20201201.2
Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20573.2 -> To Version 6.0.0-beta.20601.2
1 parent d3e6574 commit 2f30b18

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20573.2">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20601.2">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
8+
<Sha>6d8efa00a7dd2d15e07df673a83cecb8a0a3031f</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/Versions.props

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
<PatchVersion>0</PatchVersion>
1414
<VersionPrefix>$(MajorVersion).$(MinorVersion).$(PatchVersion)</VersionPrefix>
1515
<AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
16-
<PreReleaseVersionLabel></PreReleaseVersionLabel>
16+
<PreReleaseVersionLabel>
17+
</PreReleaseVersionLabel>
1718
</PropertyGroup>
1819
<PropertyGroup Condition="'$(UseGlobalToolVersion)' == 'true'">
1920
<AutoGenerateAssemblyVersion>false</AutoGenerateAssemblyVersion>

eng/common/tools.sh

+9-5
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
"rollForward": "latestMinor"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20573.2"
11+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20601.2"
1212
}
1313
}

0 commit comments

Comments
 (0)