diff options
| author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2020-12-07 16:26:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 16:26:41 +0300 |
| commit | 55480715b168f440e939928cd3f65eab21475eca (patch) | |
| tree | 13bde301c66a2b787781a2971fdd4a2e8a3c7520 /eng | |
| parent | b24d0e663d5bf4772b0896e2bc3dab3391fae744 (diff) | |
Update dependencies from https://github.com/dotnet/arcade build 20201201.2 (#1671)
[master] Update dependencies from dotnet/arcade
Diffstat (limited to 'eng')
| -rw-r--r-- | eng/Version.Details.xml | 8 | ||||
| -rw-r--r-- | eng/Versions.props | 2 | ||||
| -rwxr-xr-x | eng/common/tools.sh | 14 |
3 files changed, 14 insertions, 10 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7662795af..57fd6695f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ <ProductDependencies> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20573.2"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20601.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha> + <Sha>6d8efa00a7dd2d15e07df673a83cecb8a0a3031f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20573.2"> + <Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20601.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha> + <Sha>6d8efa00a7dd2d15e07df673a83cecb8a0a3031f</Sha> </Dependency> <Dependency Name="Microsoft.NET.Sdk.IL" Version="6.0.0-alpha.1.20580.2"> <Uri>https://github.com/dotnet/runtime</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 6ea68e9e5..493b2931c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ <SystemReflectionMetadataVersion>1.8.0</SystemReflectionMetadataVersion> <MicrosoftBuildFrameworkVersion>15.4.8</MicrosoftBuildFrameworkVersion> <MicrosoftBuildUtilitiesCoreVersion>15.4.8</MicrosoftBuildUtilitiesCoreVersion> - <MicrosoftDotNetApiCompatVersion>6.0.0-beta.20573.2</MicrosoftDotNetApiCompatVersion> + <MicrosoftDotNetApiCompatVersion>6.0.0-beta.20601.2</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20471.1</MicrosoftDotNetCodeAnalysisVersion> <MicrosoftCodeAnalysisCSharpWorkspacesVersion>3.7.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion> <MicrosoftCodeAnalysisCSharpAnalyzerTestingXunitVersion>1.0.1-beta1.*</MicrosoftCodeAnalysisCSharpAnalyzerTestingXunitVersion> 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" || { |