diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0473d2d5c..8cb52292d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -169,19 +169,19 @@ - + https://github.com/dotnet/arcade - 734d875ba2abfb5c8f5f52368e7d4711ee366e31 + f959b455e6feceeaee50f95e07dac7b8e470bc2e - + https://github.com/dotnet/arcade - 734d875ba2abfb5c8f5f52368e7d4711ee366e31 + f959b455e6feceeaee50f95e07dac7b8e470bc2e - + https://github.com/dotnet/arcade - 734d875ba2abfb5c8f5f52368e7d4711ee366e31 + f959b455e6feceeaee50f95e07dac7b8e470bc2e https://github.com/dotnet/source-build-reference-packages @@ -192,9 +192,9 @@ 0dbfbe2a408cce8438298ded794166353c860bcb - + https://github.com/dotnet/xliff-tasks - b8baaa09bffb260ba0a9725d56e9d7d83db9d17e + f7165ff3841f2c5b1b77355a6d2edb2d2f52a2d3 diff --git a/eng/Versions.props b/eng/Versions.props index 517696789..6b4382409 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 7.0.0-beta.21466.4 + 7.0.0-beta.21470.4 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 02347914f..444842899 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -709,14 +709,7 @@ function MSBuild() { Write-PipelineSetVariable -Name 'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' -Value '20' } - if ($ci) { - $env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true' - $env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6 - $env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000 - Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true' - Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6' - Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' - } + Enable-Nuget-EnhancedRetry $toolsetBuildProject = InitializeToolset $basePath = Split-Path -parent $toolsetBuildProject @@ -764,6 +757,8 @@ function MSBuild-Core() { } } + Enable-Nuget-EnhancedRetry + $buildTool = InitializeBuildTool $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" @@ -904,3 +899,18 @@ function Try-LogClientIpAddress() Write-Host "Unable to get this machine's effective IP address for logging: $_" } } + +# +# If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic. +# +function Enable-Nuget-EnhancedRetry() { + if ($ci) { + Write-Host "Setting NUGET enhanced retry environment variables" + $env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true' + $env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6 + $env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000 + Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true' + Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6' + Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' + } +} diff --git a/global.json b/global.json index a1c3cf424..7330505de 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21466.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21466.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21470.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21470.4" } }