Skip to content

Commit 436523e

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[master] Update dependencies from dotnet/arcade (#2760)
* Update dependencies from https://github.com/dotnet/arcade build 20210218.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 1.0.0-beta.21116.3 -> To Version 1.0.0-beta.21118.3 * Update dependencies from https://github.com/dotnet/arcade build 20210218.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild From Version 1.0.0-beta.21116.3 -> To Version 1.0.0-beta.21118.7 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent cb73ce2 commit 436523e

File tree

4 files changed

+52
-21
lines changed

4 files changed

+52
-21
lines changed

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21116.3">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.21118.7">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>1c06c541c2dc6edb3d652cb092785eb341ef8331</Sha>
8+
<Sha>4957a6f3dd5f6fd1ca9ff06f9c50402f2e3b17e8</Sha>
99
</Dependency>
10-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.21116.3">
10+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.21118.7">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>1c06c541c2dc6edb3d652cb092785eb341ef8331</Sha>
12+
<Sha>4957a6f3dd5f6fd1ca9ff06f9c50402f2e3b17e8</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.21116.3">
14+
<Dependency Name="Microsoft.DotNet.SignTool" Version="1.0.0-beta.21118.7">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>1c06c541c2dc6edb3d652cb092785eb341ef8331</Sha>
16+
<Sha>4957a6f3dd5f6fd1ca9ff06f9c50402f2e3b17e8</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21116.3">
18+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21118.7">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>1c06c541c2dc6edb3d652cb092785eb341ef8331</Sha>
20+
<Sha>4957a6f3dd5f6fd1ca9ff06f9c50402f2e3b17e8</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="1.0.0-beta.21116.3">
22+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="1.0.0-beta.21118.7">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>1c06c541c2dc6edb3d652cb092785eb341ef8331</Sha>
24+
<Sha>4957a6f3dd5f6fd1ca9ff06f9c50402f2e3b17e8</Sha>
2525
</Dependency>
2626
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
2727
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@
6060
<XUnitVersion>2.4.1</XUnitVersion>
6161
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
6262
<XUnitVSRunnerVersion>2.4.1</XUnitVSRunnerVersion>
63-
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.21116.3</MicrosoftDotNetBuildTasksFeedVersion>
64-
<MicrosoftDotNetSignToolVersion>1.0.0-beta.21116.3</MicrosoftDotNetSignToolVersion>
63+
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.21118.7</MicrosoftDotNetBuildTasksFeedVersion>
64+
<MicrosoftDotNetSignToolVersion>1.0.0-beta.21118.7</MicrosoftDotNetSignToolVersion>
6565
<MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
6666
<MicrosoftAzureCosmosDBTableVersion>1.1.2</MicrosoftAzureCosmosDBTableVersion>
6767
<MicrosoftAspNetCoreAllVersion>2.0.0</MicrosoftAspNetCoreAllVersion>
@@ -73,7 +73,7 @@
7373
<MicrosoftDiaSymReaderNativeVersion>1.7.0</MicrosoftDiaSymReaderNativeVersion>
7474
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.19556.4</MicrosoftDotNetMaestroClientVersion>
7575
<MicrosoftSourceLinkVersion>1.0.0-beta2-19554-01</MicrosoftSourceLinkVersion>
76-
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>1.0.0-beta.21116.3</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
76+
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>1.0.0-beta.21118.7</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
7777
<XliffTasksVersion>1.0.0-beta.20055.1</XliffTasksVersion>
7878
<!-- Roslyn -->
7979
<!-- WARNING: Depending on Roslyn in code that also supports unmanaged scenarios (e.g. C++,

‎eng/common/tools.sh‎

Lines changed: 37 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,28 @@ function InstallDotNet {
234234
}
235235
}
236236

237+
function with_retries {
238+
local maxRetries=5
239+
local retries=1
240+
echo "Trying to run '$@' for maximum of $maxRetries attempts."
241+
while [[ $((retries++)) -le $maxRetries ]]; do
242+
"$@"
243+
244+
if [[ $? == 0 ]]; then
245+
echo "Ran '$@' successfully."
246+
return 0
247+
fi
248+
249+
timeout=$((3**$retries-1))
250+
echo "Failed to execute '$@'. Waiting $timeout seconds before next attempt ($retries out of $maxRetries)." 1>&2
251+
sleep $timeout
252+
done
253+
254+
echo "Failed to execute '$@' for $maxRetries times." 1>&2
255+
256+
return 1
257+
}
258+
237259
function GetDotNetInstallScript {
238260
local root=$1
239261
local install_script="$root/dotnet-install.sh"
@@ -246,13 +268,22 @@ function GetDotNetInstallScript {
246268

247269
# Use curl if available, otherwise use wget
248270
if command -v curl > /dev/null; then
271+
# first, try directly, if this fails we will retry with verbose logging
249272
curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || {
250-
local exit_code=$?
251-
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
252-
ExitWithExitCode $exit_code
273+
if command -v openssl &> /dev/null
274+
then
275+
echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation"
276+
echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443
277+
fi
278+
echo "Will now retry the same URL with verbose logging."
279+
with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || {
280+
local exit_code=$?
281+
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
282+
ExitWithExitCode $exit_code
283+
}
253284
}
254-
else
255-
wget -q -O "$install_script" "$install_script_url" || {
285+
else
286+
with_retries wget -v -O "$install_script" "$install_script_url" || {
256287
local exit_code=$?
257288
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
258289
ExitWithExitCode $exit_code
@@ -267,7 +298,7 @@ function InitializeBuildTool {
267298
if [[ -n "${_InitializeBuildTool:-}" ]]; then
268299
return
269300
fi
270-
301+
271302
InitializeDotNetCli $restore
272303

273304
# return values

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dotnet": "6.0.100-alpha.1.21067.8"
1010
},
1111
"msbuild-sdks": {
12-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21116.3",
13-
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21116.3"
12+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21118.7",
13+
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21118.7"
1414
}
1515
}

0 commit comments

Comments
 (0)