Merge pull request #28754 from dotnet/darc-main-b133fb9a-efba-4a69-95…

…fb-62d3232f259c

[main] Update dependencies from dotnet/arcade

eng/Version.Details.xml

@@ -267,22 +267,22 @@
  </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
- <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.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>
- <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.22520.1">
+ <Dependency Name="Microsoft.DotNet.SignTool" 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.XUnitExtensions" Version="8.0.0-beta.22520.1">
+ <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22524.5">
  <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>7e27c0ab0fc92ec636c26442fd1663dc5714aa4b</Sha>
+ <Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha>
  </Dependency>
  <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-alpha.1.22524.5">
  <Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

@@ -33,7 +33,7 @@
  <SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
  <SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
  <SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
- <MicrosoftDotNetSignToolVersion>8.0.0-beta.22520.1</MicrosoftDotNetSignToolVersion>
+ <MicrosoftDotNetSignToolVersion>8.0.0-beta.22524.5</MicrosoftDotNetSignToolVersion>
  <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
  <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-alpha.1.22524.5</SystemSecurityCryptographyProtectedDataPackageVersion>
  <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -186,7 +186,7 @@
  <PropertyGroup>
  <FluentAssertionsVersion>6.7.0</FluentAssertionsVersion>
  <FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
- <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.22520.1</MicrosoftDotNetXUnitExtensionsVersion>
+ <MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.22524.5</MicrosoftDotNetXUnitExtensionsVersion>
  <MoqPackageVersion>4.8.2</MoqPackageVersion>
  <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>6.0.0-beta.22262.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>
  </PropertyGroup>

eng/common/templates/job/source-build.yml

@@ -34,8 +34,6 @@ parameters:
 jobs:
 - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
  displayName: Source-Build (${{ parameters.platform.name }})
- variables:
- - template: /eng/common/templates/variables/pool-providers.yml
 
  ${{ each property in parameters.platform.jobProperties }}:
  ${{ property.key }}: ${{ property.value }}
@@ -46,13 +44,24 @@ jobs:
  ${{ if eq(parameters.platform.pool, '') }}:
  # The default VM host AzDO pool. This should be capable of running Docker containers: almost all
  # source-build builds run in Docker, including the default managed platform.
+ # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic
  pool:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- name: $(DncEngPublicBuildPool)
+ # Main environments
+ ${{ if and(eq(variables['System.TeamProject'], 'public'), ne(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), true)) }}:
+ name: NetCore-Public
  demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- name: $(DncEngInternalBuildPool)
+ ${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), true)) }}:
+ name: NetCore1ESPool-Internal
  demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+
+ # Servicing build environments
+ ${{ if and(eq(variables['System.TeamProject'], 'public'), contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release')) }}:
+ name: NetCore-Svc-Public
+ demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
+ ${{ if and(eq(variables['System.TeamProject'], 'internal'), contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release')) }}:
+ name: NetCore1ESPool-Svc-Internal
+ demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
+
  ${{ if ne(parameters.platform.pool, '') }}:
  pool: ${{ parameters.platform.pool }}
 

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%/*}"

global.json

@@ -11,7 +11,7 @@
  }
  },
  "msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22520.1",
- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22520.1"
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22524.5",
+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22524.5"
  }
 }