Skip to content

Commit e965ae2

Browse files
dotnet-maestro[bot]jonsequitur
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20221024.5
Microsoft.DotNet.Arcade.Sdk From Version 8.0.0-beta.22520.1 -> To Version 8.0.0-beta.22524.5
1 parent b8ddb00 commit e965ae2

File tree

4 files changed

+23
-15
lines changed

4 files changed

+23
-15
lines changed

eng/Version.Details.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22520.1">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22524.5">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>7e27c0ab0fc92ec636c26442fd1663dc5714aa4b</Sha>
8+
<Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha>
99
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1010
</Dependency>
1111
</ToolsetDependencies>

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

+15-6
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ parameters:
3434
jobs:
3535
- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }}
3636
displayName: Source-Build (${{ parameters.platform.name }})
37-
variables:
38-
- template: /eng/common/templates/variables/pool-providers.yml
3937

4038
${{ each property in parameters.platform.jobProperties }}:
4139
${{ property.key }}: ${{ property.value }}
@@ -46,13 +44,24 @@ jobs:
4644
${{ if eq(parameters.platform.pool, '') }}:
4745
# The default VM host AzDO pool. This should be capable of running Docker containers: almost all
4846
# source-build builds run in Docker, including the default managed platform.
47+
# /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic
4948
pool:
50-
${{ if eq(variables['System.TeamProject'], 'public') }}:
51-
name: $(DncEngPublicBuildPool)
49+
# Main environments
50+
${{ if and(eq(variables['System.TeamProject'], 'public'), ne(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), true)) }}:
51+
name: NetCore-Public
5252
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
53-
${{ if eq(variables['System.TeamProject'], 'internal') }}:
54-
name: $(DncEngInternalBuildPool)
53+
${{ if and(eq(variables['System.TeamProject'], 'internal'), ne(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), true)) }}:
54+
name: NetCore1ESPool-Internal
5555
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
56+
57+
# Servicing build environments
58+
${{ if and(eq(variables['System.TeamProject'], 'public'), contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release')) }}:
59+
name: NetCore-Svc-Public
60+
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open
61+
${{ if and(eq(variables['System.TeamProject'], 'internal'), contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release')) }}:
62+
name: NetCore1ESPool-Svc-Internal
63+
demands: ImageOverride -equals Build.Ubuntu.1804.Amd64
64+
5665
${{ if ne(parameters.platform.pool, '') }}:
5766
pool: ${{ parameters.platform.pool }}
5867

eng/common/tools.sh

+5-6
Original file line numberDiff line numberDiff line change
@@ -417,12 +417,11 @@ function MSBuild {
417417
Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20"
418418
Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20"
419419

420-
export NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY=true
421-
export NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT=6
422-
export NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS=1000
423-
Write-PipelineSetVariable -name "NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY" -value "true"
424-
Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT" -value "6"
425-
Write-PipelineSetVariable -name "NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS" -value "1000"
420+
# https://github.com/dotnet/arcade/issues/11369 - disable new MSBuild server feature on linux
421+
# This feature is new and can result in build failures from connection timeout errors.
422+
export DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER=1
423+
Write-PipelineSetVariable -name "DOTNET_CLI_DO_NOT_USE_MSBUILD_SERVER" -value "1"
424+
426425
fi
427426

428427
local toolset_dir="${_InitializeToolset%/*}"

global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
"xcopy-msbuild": "17.1.0"
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22520.1"
13+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22524.5"
1414
}
1515
}

0 commit comments

Comments
 (0)