diff options
author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2021-09-03 20:24:16 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-03 20:24:16 +0300 |
commit | 71203ccd4fa6f999d7403f37d859ec274fce6bd6 (patch) | |
tree | afa0fd2fdacbccb056e726232a82073500d9620a | |
parent | 0fc6aa5cad5e59757fe3162e0e24f274f333ee26 (diff) |
Update dependencies from https://github.com/dotnet/arcade build 20210901.3 (#36058)
Update dependencies
-rw-r--r-- | eng/Version.Details.xml | 16 | ||||
-rw-r--r-- | eng/Versions.props | 4 | ||||
-rw-r--r-- | eng/common/tools.ps1 | 11 | ||||
-rwxr-xr-x | eng/common/tools.sh | 9 | ||||
-rw-r--r-- | global.json | 4 |
5 files changed, 32 insertions, 12 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bea7cf1cb3..06bb896143 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -296,22 +296,22 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>c570efdbfb47fdffe9b5b04d47f069b31f5d7f78</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21427.6"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21451.3"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha> + <Sha>923c95ec2e9512285f801c84145a8af3728b1e3b</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21427.6"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21451.3"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha> + <Sha>923c95ec2e9512285f801c84145a8af3728b1e3b</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21427.6"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.21451.3"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha> + <Sha>923c95ec2e9512285f801c84145a8af3728b1e3b</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21427.6"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21451.3"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha> + <Sha>923c95ec2e9512285f801c84145a8af3728b1e3b</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index 9fda53fc99..32bd9aa3e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,8 +138,8 @@ <MicrosoftEntityFrameworkCoreVersion>7.0.0-alpha.1.21451.8</MicrosoftEntityFrameworkCoreVersion> <MicrosoftEntityFrameworkCoreDesignVersion>7.0.0-alpha.1.21451.8</MicrosoftEntityFrameworkCoreDesignVersion> <!-- Packages from dotnet/arcade --> - <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21427.6</MicrosoftDotNetBuildTasksInstallersVersion> - <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21427.6</MicrosoftDotNetBuildTasksTemplatingVersion> + <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21451.3</MicrosoftDotNetBuildTasksInstallersVersion> + <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21451.3</MicrosoftDotNetBuildTasksTemplatingVersion> </PropertyGroup> <!-- diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 56ee4a577a..02347914f5 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -709,6 +709,15 @@ 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' + } + $toolsetBuildProject = InitializeToolset $basePath = Split-Path -parent $toolsetBuildProject $possiblePaths = @( @@ -717,6 +726,8 @@ function MSBuild() { (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')), (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')), (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll')) + (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')), + (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll')) ) $selectedPath = $null foreach ($path in $possiblePaths) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 41e323104d..6a4871ef72 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -417,6 +417,13 @@ function MSBuild { export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20 Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20" Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20" + + export NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true + export NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT=6 + export 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" fi local toolset_dir="${_InitializeToolset%/*}" @@ -427,6 +434,8 @@ function MSBuild { possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" ) possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" ) possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" ) + possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" ) + possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" ) for path in "${possiblePaths[@]}"; do if [[ -f $path ]]; then selectedPath=$path diff --git a/global.json b/global.json index 0484118f2a..9faa21f462 100644 --- a/global.json +++ b/global.json @@ -29,7 +29,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21427.6" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21451.3", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21451.3" } } |