From 17c4557dfd799f25ce6d96324a2d20661a44bea6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Sep 2021 19:27:33 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/arcade (#11837) [main] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21428.1 to 1.0.0-beta.21431.1 (parent: Microsoft.DotNet.Arcade.Sdk) - Update DotNetBuildFromSource conditioned code Conditioned code can now be updated since a new version of Arcade is being taken. --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/tools.ps1 | 11 +++++++++++ eng/common/tools.sh | 9 +++++++++ global.json | 6 +++--- src/redist/targets/GenerateMSIs.targets | 3 +-- 6 files changed, 33 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b88258bab..dca89aa0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -157,19 +157,19 @@ - + https://github.com/dotnet/arcade - e0260cb677c04cb0244aad7537c33bec4adce422 + 7309c692126e24bc10702f39fe45b2a295b224d2 - + https://github.com/dotnet/arcade - e0260cb677c04cb0244aad7537c33bec4adce422 + 7309c692126e24bc10702f39fe45b2a295b224d2 - + https://github.com/dotnet/arcade - e0260cb677c04cb0244aad7537c33bec4adce422 + 7309c692126e24bc10702f39fe45b2a295b224d2 https://github.com/dotnet/source-build-reference-packages @@ -180,9 +180,9 @@ 6dcc7d005e38829efb6714d2ecfc4c0cb383e7d9 - + https://github.com/dotnet/xliff-tasks - 178ed3c7ed19e5bda54a8c3f15a5c441ee63ab93 + bc3233146e1fcd393ed471d5005333c83363e0fe diff --git a/eng/Versions.props b/eng/Versions.props index 03aa07129..e72dc0441 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ - 6.0.0-beta.21430.1 + 7.0.0-beta.21456.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 56ee4a577..02347914f 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 41e323104..6a4871ef7 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 f62e6a04b..d24081133 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.100-rc.1.21379.2", + "dotnet": "6.0.100-rc.1.21430.12", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21430.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21430.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21456.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21456.1" } } diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 09f8e487a..667dccd6d 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -2,8 +2,7 @@ netcoreapp3.1 - net5.0 - net6.0 + net6.0 net472 $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersPackageVersion)\tools\$(MicrosoftDotNetBuildTasksInstallersTaskTargetFramework)\Microsoft.DotNet.Build.Tasks.Installers.dll