Skip to content

Commit 4c8b357

Browse files
dotnet-maestro[bot]mmitche
dotnet-maestro[bot]
and
mmitche
authored
[main] Update dependencies from dotnet/arcade (#7601)
* Update dependencies from https://github.com/dotnet/arcade build 20260321.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26163.2 -> To Version 11.0.0-beta.26171.1 * Update dependencies from https://github.com/dotnet/arcade build 20260327.6 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26163.2 -> To Version 11.0.0-beta.26177.6 * Update dependencies from https://github.com/dotnet/arcade build 20260404.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26163.2 -> To Version 11.0.0-beta.26204.1 * Update dependencies from https://github.com/dotnet/arcade build 20260411.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 11.0.0-beta.26163.2 -> To Version 11.0.0-beta.26211.1 * Add dotnet11 package source to NuGet.config --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
1 parent 3ff4be3 commit 4c8b357

54 files changed

Lines changed: 378 additions & 1519 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎NuGet.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
1717
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
1818
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
19+
<add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
1920
</packageSources>
2021
<packageSourceMapping>
2122
<packageSource key="darc-pub-dotnet-maintenance-packages-ab95a1f1">
@@ -54,6 +55,9 @@
5455
<packageSource key="dotnet9">
5556
<package pattern="*" />
5657
</packageSource>
58+
<packageSource key="dotnet11">
59+
<package pattern="*" />
60+
</packageSource>
5761
</packageSourceMapping>
5862
<disabledPackageSources>
5963
<clear />

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,38 @@
77
</Dependency>
88
</ProductDependencies>
99
<ToolsetDependencies>
10-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26163.2">
10+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26211.1">
1111
<Uri>https://github.com/dotnet/arcade</Uri>
12-
<Sha>2e8c949b4e75b05c3a33e848f36cf5b263707338</Sha>
12+
<Sha>a08169b890573cfd7f949ea9062c86a4db1aab1b</Sha>
1313
</Dependency>
14-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26163.2">
14+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26211.1">
1515
<Uri>https://github.com/dotnet/arcade</Uri>
16-
<Sha>2e8c949b4e75b05c3a33e848f36cf5b263707338</Sha>
16+
<Sha>a08169b890573cfd7f949ea9062c86a4db1aab1b</Sha>
1717
</Dependency>
18-
<Dependency Name="Microsoft.DotNet.SignTool" Version="11.0.0-beta.26163.2">
18+
<Dependency Name="Microsoft.DotNet.SignTool" Version="11.0.0-beta.26211.1">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>2e8c949b4e75b05c3a33e848f36cf5b263707338</Sha>
20+
<Sha>a08169b890573cfd7f949ea9062c86a4db1aab1b</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26163.2">
22+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.26211.1">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>2e8c949b4e75b05c3a33e848f36cf5b263707338</Sha>
24+
<Sha>a08169b890573cfd7f949ea9062c86a4db1aab1b</Sha>
2525
</Dependency>
2626
<!-- Stay on package 8.0 until we stop testing for net6.0
2727
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24212.4">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
2929
<Sha>812d978c303174dc1aa305d7359e79053d7d4971</Sha>
3030
</Dependency> -->
31-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="11.0.0-beta.26163.2">
31+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="11.0.0-beta.26211.1">
3232
<Uri>https://github.com/dotnet/arcade</Uri>
33-
<Sha>2e8c949b4e75b05c3a33e848f36cf5b263707338</Sha>
33+
<Sha>a08169b890573cfd7f949ea9062c86a4db1aab1b</Sha>
3434
</Dependency>
35-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="11.0.0-beta.26163.2">
35+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="11.0.0-beta.26211.1">
3636
<Uri>https://github.com/dotnet/arcade</Uri>
37-
<Sha>2e8c949b4e75b05c3a33e848f36cf5b263707338</Sha>
37+
<Sha>a08169b890573cfd7f949ea9062c86a4db1aab1b</Sha>
3838
</Dependency>
39-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26163.2">
39+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.26211.1">
4040
<Uri>https://github.com/dotnet/arcade</Uri>
41-
<Sha>2e8c949b4e75b05c3a33e848f36cf5b263707338</Sha>
41+
<Sha>a08169b890573cfd7f949ea9062c86a4db1aab1b</Sha>
4242
</Dependency>
4343
</ToolsetDependencies>
4444
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24212.4</MicrosoftDotNetBuildTasksTemplatingVersion>
9999
<MicrosoftDotNetPlatformAbstractionsVersion>5.0.0-preview.5.20278.1</MicrosoftDotNetPlatformAbstractionsVersion>
100100
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.24525.2</MicrosoftDotNetRemoteExecutorVersion>
101-
<MicrosoftDotNetXUnitExtensionsVersion>11.0.0-beta.26163.2</MicrosoftDotNetXUnitExtensionsVersion>
101+
<MicrosoftDotNetXUnitExtensionsVersion>11.0.0-beta.26211.1</MicrosoftDotNetXUnitExtensionsVersion>
102102
<MicrosoftExtensionsDependencyModelVersion>9.0.4</MicrosoftExtensionsDependencyModelVersion>
103103
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
104104
<MicrosoftMLTensorFlowTestModelsVersion>0.0.13-test</MicrosoftMLTensorFlowTestModelsVersion>

‎eng/common/build.ps1‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Param(
66
[string][Alias('v')]$verbosity = "minimal",
77
[string] $msbuildEngine = $null,
88
[bool] $warnAsError = $true,
9+
[string] $warnNotAsError = '',
910
[bool] $nodeReuse = $true,
1011
[switch] $buildCheck = $false,
1112
[switch][Alias('r')]$restore,
@@ -70,6 +71,7 @@ function Print-Usage() {
7071
Write-Host " -excludeCIBinarylog Don't output binary log (short: -nobl)"
7172
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
7273
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
74+
Write-Host " -warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
7375
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
7476
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
7577
Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"

‎eng/common/build.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ usage()
4242
echo " --prepareMachine Prepare machine for CI run, clean up processes after build"
4343
echo " --nodeReuse <value> Sets nodereuse msbuild parameter ('true' or 'false')"
4444
echo " --warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
45+
echo " --warnNotAsError <value> Sets a semi-colon delimited list of warning codes that should not be treated as errors"
4546
echo " --buildCheck <value> Sets /check msbuild parameter"
4647
echo " --fromVMR Set when building from within the VMR"
4748
echo ""
@@ -78,6 +79,7 @@ ci=false
7879
clean=false
7980

8081
warn_as_error=true
82+
warn_not_as_error=''
8183
node_reuse=true
8284
build_check=false
8385
binary_log=false
@@ -176,6 +178,10 @@ while [[ $# -gt 0 ]]; do
176178
warn_as_error=$2
177179
shift
178180
;;
181+
-warnnotaserror)
182+
warn_not_as_error=$2
183+
shift
184+
;;
179185
-nodereuse)
180186
node_reuse=$2
181187
shift

‎eng/common/core-templates/job/job.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ parameters:
2626
enablePublishBuildArtifacts: false
2727
enablePublishBuildAssets: false
2828
enablePublishTestResults: false
29+
enablePublishing: false
2930
enableBuildRetry: false
3031
mergeTestResults: false
3132
testRunTitle: ''
3233
testResultsFormat: ''
3334
name: ''
34-
componentGovernanceSteps: []
3535
preSteps: []
3636
artifactPublishSteps: []
3737
runAsPublic: false
@@ -152,9 +152,6 @@ jobs:
152152
- ${{ each step in parameters.steps }}:
153153
- ${{ step }}
154154

155-
- ${{ each step in parameters.componentGovernanceSteps }}:
156-
- ${{ step }}
157-
158155
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
159156
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
160157
parameters:

‎eng/common/core-templates/job/onelocbuild.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ jobs:
5252
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
5353
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
5454
name: AzurePipelines-EO
55-
image: 1ESPT-Windows2022
55+
image: 1ESPT-Windows2025
5656
demands: Cmd
5757
os: windows
5858
# If it's not devdiv, it's dnceng
5959
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
6060
name: $(DncEngInternalBuildPool)
61-
image: 1es-windows-2022
61+
image: windows.vs2026.amd64
6262
os: windows
6363

6464
steps:

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ jobs:
7474
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
7575
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
7676
name: AzurePipelines-EO
77-
image: 1ESPT-Windows2022
77+
image: 1ESPT-Windows2025
7878
demands: Cmd
7979
os: windows
8080
# If it's not devdiv, it's dnceng
8181
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
8282
name: NetCore1ESPool-Publishing-Internal
83-
image: windows.vs2022.amd64
83+
image: windows.vs2026.amd64
8484
os: windows
8585
steps:
8686
- ${{ if eq(parameters.is1ESPipeline, '') }}:
@@ -172,17 +172,18 @@ jobs:
172172
targetPath: '$(Build.ArtifactStagingDirectory)/MergedManifest.xml'
173173
artifactName: AssetManifests
174174
displayName: 'Publish Merged Manifest'
175-
retryCountOnTaskFailure: 10 # for any logs being locked
176-
sbomEnabled: false # we don't need SBOM for logs
175+
retryCountOnTaskFailure: 10 # for any files being locked
176+
isProduction: false # just metadata for publishing
177177

178-
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
178+
- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml
179179
parameters:
180180
is1ESPipeline: ${{ parameters.is1ESPipeline }}
181181
args:
182182
displayName: Publish ReleaseConfigs Artifact
183-
pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs'
184-
publishLocation: Container
183+
targetPath: '$(Build.StagingDirectory)/ReleaseConfigs'
185184
artifactName: ReleaseConfigs
185+
retryCountOnTaskFailure: 10 # for any files being locked
186+
isProduction: false # just metadata for publishing
186187

187188
- ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
188189
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
@@ -218,4 +219,5 @@ jobs:
218219
- template: /eng/common/core-templates/steps/publish-logs.yml
219220
parameters:
220221
is1ESPipeline: ${{ parameters.is1ESPipeline }}
222+
StageLabel: 'BuildAssetRegistry'
221223
JobLabel: 'Publish_Artifacts_Logs'

‎eng/common/core-templates/job/renovate.yml‎

Lines changed: 69 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,30 @@ parameters:
5353
type: boolean
5454
default: false
5555

56+
# Name of the arcade repository resource in the pipeline.
57+
# This allows repos which haven't been onboarded to Arcade to still use this
58+
# template by checking out the repo as a resource with a custom name and pointing
59+
# this parameter to it.
60+
- name: arcadeRepoResource
61+
type: string
62+
default: self
63+
64+
# Directory name for the self repo under $(Build.SourcesDirectory) in multi-checkout.
65+
# In multi-checkout (when arcadeRepoResource != 'self'), Azure DevOps checks out the
66+
# self repo to $(Build.SourcesDirectory)/<repoName>. Set this to match the auto-generated
67+
# directory name. Using the auto-generated name is necessary rather than explicitly
68+
# defining a checkout path because container jobs expect repos to live under the agent's
69+
# workspace ($(Pipeline.Workspace)). On some self-hosted setups the host path
70+
# (e.g., /mnt/vss/_work) differs from the container path (e.g., /__w), and a custom checkout
71+
# path can fail validation. Using the default checkout location keeps the paths consistent
72+
# and avoids this issue.
73+
- name: selfRepoName
74+
type: string
75+
default: ''
76+
- name: arcadeRepoName
77+
type: string
78+
default: ''
79+
5680
# Pool configuration for the job.
5781
- name: pool
5882
type: object
@@ -71,16 +95,36 @@ jobs:
7195
# Changing the variable name here would require updating the name in https://github.com/dotnet/arcade/blob/main/eng/renovate.json as well.
7296
- name: renovateVersion
7397
value: '42'
98+
readonly: true
99+
- name: renovateLogFilePath
100+
value: '$(Build.ArtifactStagingDirectory)/renovate.json'
101+
readonly: true
74102
- name: dryRunArg
103+
readonly: true
75104
${{ if eq(parameters.dryRun, true) }}:
76105
value: 'full'
77106
${{ else }}:
78107
value: ''
79108
- name: recreateWhenArg
109+
readonly: true
80110
${{ if eq(parameters.forceRecreatePR, true) }}:
81111
value: 'always'
82112
${{ else }}:
83113
value: ''
114+
# In multi-checkout (without custom paths), Azure DevOps places each repo under
115+
# $(Build.SourcesDirectory)/<repoName>. selfRepoName must be provided in that case.
116+
- name: selfRepoPath
117+
readonly: true
118+
${{ if eq(parameters.arcadeRepoResource, 'self') }}:
119+
value: '$(Build.SourcesDirectory)'
120+
${{ else }}:
121+
value: '$(Build.SourcesDirectory)/${{ parameters.selfRepoName }}'
122+
- name: arcadeRepoPath
123+
readonly: true
124+
${{ if eq(parameters.arcadeRepoResource, 'self') }}:
125+
value: '$(Build.SourcesDirectory)'
126+
${{ else }}:
127+
value: '$(Build.SourcesDirectory)/${{ parameters.arcadeRepoName }}'
84128
pool: ${{ parameters.pool }}
85129

86130
templateContext:
@@ -91,22 +135,39 @@ jobs:
91135
condition: succeededOrFailed()
92136
targetPath: $(Build.ArtifactStagingDirectory)
93137
artifactName: $(Agent.JobName)_Logs_Attempt$(System.JobAttempt)
94-
sbomEnabled: false
138+
isProduction: false # logs are non-production artifacts
95139

96140
steps:
97141
- checkout: self
98142
fetchDepth: 1
143+
144+
- ${{ if ne(parameters.arcadeRepoResource, 'self') }}:
145+
- checkout: ${{ parameters.arcadeRepoResource }}
146+
fetchDepth: 1
99147

100-
- script: renovate-config-validator $(Build.SourcesDirectory)/${{parameters.renovateConfigPath}}
148+
- script: |
149+
renovate-config-validator $(selfRepoPath)/${{parameters.renovateConfigPath}} 2>&1 | tee /tmp/renovate-config-validator.out
150+
validatorExit=${PIPESTATUS[0]}
151+
if grep -q '^ WARN:' /tmp/renovate-config-validator.out; then
152+
echo "##vso[task.logissue type=warning]Renovate config validator produced warnings."
153+
echo "##vso[task.complete result=SucceededWithIssues]"
154+
fi
155+
exit $validatorExit
101156
displayName: Validate Renovate config
102157
env:
103158
LOG_LEVEL: info
104159
LOG_FILE_LEVEL: debug
105160
LOG_FILE: $(Build.ArtifactStagingDirectory)/renovate-config-validator.json
106161
107162
- script: |
108-
. $(Build.SourcesDirectory)/eng/common/renovate.env
109-
renovate
163+
. $(arcadeRepoPath)/eng/common/renovate.env
164+
renovate 2>&1 | tee /tmp/renovate.out
165+
renovateExit=${PIPESTATUS[0]}
166+
if grep -q '^ WARN:' /tmp/renovate.out; then
167+
echo "##vso[task.logissue type=warning]Renovate produced warnings."
168+
echo "##vso[task.complete result=SucceededWithIssues]"
169+
fi
170+
exit $renovateExit
110171
displayName: Run Renovate
111172
env:
112173
RENOVATE_FORK_TOKEN: $(BotAccount-dotnet-renovate-bot-PAT)
@@ -117,13 +178,13 @@ jobs:
117178
RENOVATE_RECREATE_WHEN: $(recreateWhenArg)
118179
LOG_LEVEL: info
119180
LOG_FILE_LEVEL: debug
120-
LOG_FILE: $(Build.ArtifactStagingDirectory)/renovate.json
121-
RENOVATE_CONFIG_FILE: $(Build.SourcesDirectory)/${{parameters.renovateConfigPath}}
181+
LOG_FILE: $(renovateLogFilePath)
182+
RENOVATE_CONFIG_FILE: $(selfRepoPath)/${{parameters.renovateConfigPath}}
122183
123184
- script: |
124185
echo "PRs created by Renovate:"
125-
if [ -s "$(Build.ArtifactStagingDirectory)/renovate-log.json" ]; then
126-
if ! jq -r 'select(.msg == "PR created" and .pr != null) | "https://github.com/\(.repository)/pull/\(.pr)"' "$(Build.ArtifactStagingDirectory)/renovate-log.json" | sort -u; then
186+
if [ -s "$(renovateLogFilePath)" ]; then
187+
if ! jq -r 'select(.msg == "PR created" and .pr != null) | "https://github.com/\(.repository)/pull/\(.pr)"' "$(renovateLogFilePath)" | sort -u; then
127188
echo "##vso[task.logissue type=warning]Failed to parse Renovate log file with jq."
128189
echo "##vso[task.complete result=SucceededWithIssues]"
129190
fi

‎eng/common/core-templates/job/source-index-stage1.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
variables:
1616
- name: BinlogPath
1717
value: ${{ parameters.binlogPath }}
18+
- name: skipComponentGovernanceDetection
19+
value: true
1820
- template: /eng/common/core-templates/variables/pool-providers.yml
1921
parameters:
2022
is1ESPipeline: ${{ parameters.is1ESPipeline }}

0 commit comments

Comments
 (0)