Update dependencies from https://github.com/dotnet/arcade build 20221024.5 (#3092)
[main] Update dependencies from dotnet/arcade
This commit is contained in:
Родитель
c5d28ae8f8
Коммит
aea1d9fb47
|
@ -3,14 +3,14 @@
|
|||
<ProductDependencies>
|
||||
</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.ApiCompat" Version="8.0.0-beta.22520.1">
|
||||
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22524.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>7e27c0ab0fc92ec636c26442fd1663dc5714aa4b</Sha>
|
||||
<Sha>c5dd6a1da2e6d9b3423ab809fcda8af2927a408b</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-rtm.22507.1">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
|
||||
<MicrosoftBuildFrameworkVersion>17.0.0-preview-21267-01</MicrosoftBuildFrameworkVersion>
|
||||
<MicrosoftBuildUtilitiesCoreVersion>17.0.0-preview-21267-01</MicrosoftBuildUtilitiesCoreVersion>
|
||||
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.22520.1</MicrosoftDotNetApiCompatVersion>
|
||||
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.22524.5</MicrosoftDotNetApiCompatVersion>
|
||||
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21271.1</MicrosoftDotNetCodeAnalysisVersion>
|
||||
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
|
||||
<MicrosoftCodeAnalysisVersion>4.5.0-1.22517.9</MicrosoftCodeAnalysisVersion>
|
||||
|
|
|
@ -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 }}
|
||||
|
||||
|
|
|
@ -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%/*}"
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
"xcopy-msbuild": "17.2.1"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22520.1",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22524.5",
|
||||
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
|
||||
"Microsoft.NET.Sdk.IL": "7.0.0-rtm.22507.1"
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче