diff options
| author | dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> | 2022-10-31 17:06:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-31 17:06:41 +0300 |
| commit | ec45a83777b9efa471ffbcac63461945d1941e37 (patch) | |
| tree | 6595f3fd3c5009db9cfd7c7fcd10602c67a725f3 /eng | |
| parent | 51fc6824e30016404964fc96a4a098a764bdbbfa (diff) | |
Update dependencies from https://github.com/dotnet/arcade build 20221024.5 (#44794)
[main] Update dependencies from dotnet/arcade
Diffstat (limited to 'eng')
| -rw-r--r-- | eng/Version.Details.xml | 16 | ||||
| -rw-r--r-- | eng/Versions.props | 4 | ||||
| -rwxr-xr-x | eng/common/tools.sh | 11 |
3 files changed, 15 insertions, 16 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8284e381cd..764090f6e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -302,22 +302,22 @@ <Uri>https://github.com/dotnet/runtime</Uri> <Sha>65233ebb1368ab5eebe76c05aac852b9b6a8cde8</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22520.1"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22524.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>7e27c0ab0fc92ec636c26442fd1663dc5714aa4b</Sha> + <Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22520.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22524.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>7e27c0ab0fc92ec636c26442fd1663dc5714aa4b</Sha> + <Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22520.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22524.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>7e27c0ab0fc92ec636c26442fd1663dc5714aa4b</Sha> + <Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22520.1"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22524.5"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>7e27c0ab0fc92ec636c26442fd1663dc5714aa4b</Sha> + <Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha> </Dependency> </ToolsetDependencies> </Dependencies> diff --git a/eng/Versions.props b/eng/Versions.props index e044561203..9631e0e2a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,8 +135,8 @@ <MicrosoftEntityFrameworkCoreVersion>8.0.0-alpha.1.22526.1</MicrosoftEntityFrameworkCoreVersion> <MicrosoftEntityFrameworkCoreDesignVersion>8.0.0-alpha.1.22526.1</MicrosoftEntityFrameworkCoreDesignVersion> <!-- Packages from dotnet/arcade --> - <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22520.1</MicrosoftDotNetBuildTasksInstallersVersion> - <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22520.1</MicrosoftDotNetBuildTasksTemplatingVersion> + <MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22524.5</MicrosoftDotNetBuildTasksInstallersVersion> + <MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22524.5</MicrosoftDotNetBuildTasksTemplatingVersion> <!-- Packages from dotnet/source-build-externals --> <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>8.0.0-alpha.1.22513.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion> <!-- Packages from dotnet/xdt --> diff --git a/eng/common/tools.sh b/eng/common/tools.sh index dc19dfabe8..6586eab458 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -417,12 +417,11 @@ function MSBuild { 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" + # https://github.com/dotnet/arcade/issues/11369 - disable new MSBuild server feature on linux + # This feature is new and can result in build failures from connection timeout errors. + export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER=1 + Write-PipelineSetVariable -name "DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER" -value "1" + fi local toolset_dir="${_InitializeToolset%/*}" |