Skip to content

Commit 0af589c

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Merge pull request #2800 from dotnet/darc-release/10.0-d2fa38b3-ded3-4bf1-a6e6-d5ba07b98636
[release/10.0] Source code updates from dotnet/dotnet
1 parent 121a6d4 commit 0af589c

31 files changed

Lines changed: 266 additions & 316 deletions

‎eng/Version.Details.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ This file should be imported by eng/Versions.props
55
-->
66
<Project>
77
<PropertyGroup>
8-
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26117.104</MicrosoftDotNetArcadeSdkPackageVersion>
8+
<!-- dotnet-dotnet dependencies -->
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26217.115</MicrosoftDotNetArcadeSdkPackageVersion>
1010
</PropertyGroup>
1111
<!--Property group for alternate package version names-->
1212
<PropertyGroup>
13-
<!-- dotnet/dotnet dependencies -->
13+
<!-- dotnet-dotnet dependencies -->
1414
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
1515
</PropertyGroup>
1616
</Project>

‎eng/Version.Details.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="1681538ae28fe973fbd1d66f39884ec8cc800269" BarId="302124" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="command-line-api" Sha="71d1809a66d8aacbe21208baeb0bbc484191b3d1" BarId="311039" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26117.104">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26217.115">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>1681538ae28fe973fbd1d66f39884ec8cc800269</Sha>
9+
<Sha>71d1809a66d8aacbe21208baeb0bbc484191b3d1</Sha>
1010
</Dependency>
1111
</ToolsetDependencies>
1212
</Dependencies>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<!-- Repo Version Information -->
66
<PropertyGroup>
7-
<VersionPrefix>2.0.4</VersionPrefix>
7+
<VersionPrefix>2.0.8</VersionPrefix>
88
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
99
<PreReleaseVersionIteration></PreReleaseVersionIteration>
1010
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ parameters:
2424
enablePublishBuildArtifacts: false
2525
enablePublishBuildAssets: false
2626
enablePublishTestResults: false
27+
enablePublishing: false
2728
enableBuildRetry: false
2829
mergeTestResults: false
2930
testRunTitle: ''
3031
testResultsFormat: ''
3132
name: ''
32-
componentGovernanceSteps: []
3333
preSteps: []
3434
artifactPublishSteps: []
3535
runAsPublic: false
@@ -146,9 +146,6 @@ jobs:
146146
- ${{ each step in parameters.steps }}:
147147
- ${{ step }}
148148

149-
- ${{ each step in parameters.componentGovernanceSteps }}:
150-
- ${{ step }}
151-
152149
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
153150
- template: /eng/common/core-templates/steps/cleanup-microbuild.yml
154151
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: 10 additions & 8 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 }}
221-
JobLabel: 'Publish_Artifacts_Logs'
222+
StageLabel: 'BuildAssetRegistry'
223+
JobLabel: 'Publish_Artifacts_Logs'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
demands: ImageOverride -equals build.azurelinux.3.amd64.open
6464
${{ if eq(variables['System.TeamProject'], 'internal') }}:
6565
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
66-
image: Azure-Linux-3-Amd64
66+
image: build.azurelinux.3.amd64
6767
os: linux
6868
${{ else }}:
6969
pool:

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ parameters:
4343

4444
artifacts: {}
4545
is1ESPipeline: ''
46+
47+
# Publishing version w/default.
48+
publishingVersion: 3
49+
4650
repositoryAlias: self
4751
officialBuildId: ''
4852

@@ -102,6 +106,7 @@ jobs:
102106
parameters:
103107
is1ESPipeline: ${{ parameters.is1ESPipeline }}
104108
continueOnError: ${{ parameters.continueOnError }}
109+
publishingVersion: ${{ parameters.publishingVersion }}
105110
dependsOn:
106111
- ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}:
107112
- ${{ each job in parameters.publishBuildAssetsDependsOn }}:

‎eng/common/core-templates/post-build/post-build.yml‎

Lines changed: 82 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ parameters:
99
default: 3
1010
values:
1111
- 3
12+
- 4
1213

1314
- name: BARBuildId
1415
displayName: BAR Build Id
@@ -120,7 +121,7 @@ stages:
120121
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
121122
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
122123
name: AzurePipelines-EO
123-
image: 1ESPT-Windows2022
124+
image: 1ESPT-Windows2025
124125
demands: Cmd
125126
os: windows
126127
# If it's not devdiv, it's dnceng
@@ -140,16 +141,30 @@ stages:
140141
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
141142
is1ESPipeline: ${{ parameters.is1ESPipeline }}
142143

143-
- task: DownloadBuildArtifacts@0
144-
displayName: Download Package Artifacts
145-
inputs:
146-
buildType: specific
147-
buildVersionToDownload: specific
148-
project: $(AzDOProjectName)
149-
pipeline: $(AzDOPipelineId)
150-
buildId: $(AzDOBuildId)
151-
artifactName: PackageArtifacts
152-
checkDownloadedFiles: true
144+
- ${{ if ne(parameters.publishingInfraVersion, 4) }}:
145+
- task: DownloadBuildArtifacts@0
146+
displayName: Download Package Artifacts
147+
inputs:
148+
buildType: specific
149+
buildVersionToDownload: specific
150+
project: $(AzDOProjectName)
151+
pipeline: $(AzDOPipelineId)
152+
buildId: $(AzDOBuildId)
153+
artifactName: PackageArtifacts
154+
checkDownloadedFiles: true
155+
- ${{ if eq(parameters.publishingInfraVersion, 4) }}:
156+
- task: DownloadPipelineArtifact@2
157+
displayName: Download Pipeline Artifacts (V4)
158+
inputs:
159+
itemPattern: '*/packages/**/*.nupkg'
160+
targetPath: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload'
161+
- task: CopyFiles@2
162+
displayName: Flatten packages to PackageArtifacts
163+
inputs:
164+
SourceFolder: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload'
165+
Contents: '**/*.nupkg'
166+
TargetFolder: '$(Build.ArtifactStagingDirectory)/PackageArtifacts'
167+
flattenFolders: true
153168

154169
- task: PowerShell@2
155170
displayName: Validate
@@ -164,14 +179,14 @@ stages:
164179
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
165180
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
166181
name: AzurePipelines-EO
167-
image: 1ESPT-Windows2022
182+
image: 1ESPT-Windows2025
168183
demands: Cmd
169184
os: windows
170185
# If it's not devdiv, it's dnceng
171186
${{ else }}:
172187
${{ if eq(parameters.is1ESPipeline, true) }}:
173188
name: $(DncEngInternalBuildPool)
174-
image: 1es-windows-2022
189+
image: windows.vs2026.amd64
175190
os: windows
176191
${{ else }}:
177192
name: $(DncEngInternalBuildPool)
@@ -183,16 +198,30 @@ stages:
183198
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
184199
is1ESPipeline: ${{ parameters.is1ESPipeline }}
185200

186-
- task: DownloadBuildArtifacts@0
187-
displayName: Download Package Artifacts
188-
inputs:
189-
buildType: specific
190-
buildVersionToDownload: specific
191-
project: $(AzDOProjectName)
192-
pipeline: $(AzDOPipelineId)
193-
buildId: $(AzDOBuildId)
194-
artifactName: PackageArtifacts
195-
checkDownloadedFiles: true
201+
- ${{ if ne(parameters.publishingInfraVersion, 4) }}:
202+
- task: DownloadBuildArtifacts@0
203+
displayName: Download Package Artifacts
204+
inputs:
205+
buildType: specific
206+
buildVersionToDownload: specific
207+
project: $(AzDOProjectName)
208+
pipeline: $(AzDOPipelineId)
209+
buildId: $(AzDOBuildId)
210+
artifactName: PackageArtifacts
211+
checkDownloadedFiles: true
212+
- ${{ if eq(parameters.publishingInfraVersion, 4) }}:
213+
- task: DownloadPipelineArtifact@2
214+
displayName: Download Pipeline Artifacts (V4)
215+
inputs:
216+
itemPattern: '*/packages/**/*.nupkg'
217+
targetPath: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload'
218+
- task: CopyFiles@2
219+
displayName: Flatten packages to PackageArtifacts
220+
inputs:
221+
SourceFolder: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload'
222+
Contents: '**/*.nupkg'
223+
TargetFolder: '$(Build.ArtifactStagingDirectory)/PackageArtifacts'
224+
flattenFolders: true
196225

197226
# This is necessary whenever we want to publish/restore to an AzDO private feed
198227
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
@@ -225,14 +254,14 @@ stages:
225254
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
226255
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
227256
name: AzurePipelines-EO
228-
image: 1ESPT-Windows2022
257+
image: 1ESPT-Windows2025
229258
demands: Cmd
230259
os: windows
231260
# If it's not devdiv, it's dnceng
232261
${{ else }}:
233262
${{ if eq(parameters.is1ESPipeline, true) }}:
234263
name: $(DncEngInternalBuildPool)
235-
image: 1es-windows-2022
264+
image: windows.vs2026.amd64
236265
os: windows
237266
${{ else }}:
238267
name: $(DncEngInternalBuildPool)
@@ -244,16 +273,30 @@ stages:
244273
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
245274
is1ESPipeline: ${{ parameters.is1ESPipeline }}
246275

247-
- task: DownloadBuildArtifacts@0
248-
displayName: Download Blob Artifacts
249-
inputs:
250-
buildType: specific
251-
buildVersionToDownload: specific
252-
project: $(AzDOProjectName)
253-
pipeline: $(AzDOPipelineId)
254-
buildId: $(AzDOBuildId)
255-
artifactName: BlobArtifacts
256-
checkDownloadedFiles: true
276+
- ${{ if ne(parameters.publishingInfraVersion, 4) }}:
277+
- task: DownloadBuildArtifacts@0
278+
displayName: Download Blob Artifacts
279+
inputs:
280+
buildType: specific
281+
buildVersionToDownload: specific
282+
project: $(AzDOProjectName)
283+
pipeline: $(AzDOPipelineId)
284+
buildId: $(AzDOBuildId)
285+
artifactName: BlobArtifacts
286+
checkDownloadedFiles: true
287+
- ${{ if eq(parameters.publishingInfraVersion, 4) }}:
288+
- task: DownloadPipelineArtifact@2
289+
displayName: Download Pipeline Artifacts (V4)
290+
inputs:
291+
itemPattern: '*/assets/**'
292+
targetPath: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload'
293+
- task: CopyFiles@2
294+
displayName: Flatten assets to BlobArtifacts
295+
inputs:
296+
SourceFolder: '$(Build.ArtifactStagingDirectory)/PipelineArtifactsDownload'
297+
Contents: '**/*'
298+
TargetFolder: '$(Build.ArtifactStagingDirectory)/BlobArtifacts'
299+
flattenFolders: true
257300

258301
- task: PowerShell@2
259302
displayName: Validate
@@ -286,18 +329,18 @@ stages:
286329
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
287330
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
288331
name: AzurePipelines-EO
289-
image: 1ESPT-Windows2022
332+
image: 1ESPT-Windows2025
290333
demands: Cmd
291334
os: windows
292335
# If it's not devdiv, it's dnceng
293336
${{ else }}:
294337
${{ if eq(parameters.is1ESPipeline, true) }}:
295338
name: NetCore1ESPool-Publishing-Internal
296-
image: windows.vs2022.amd64
339+
image: windows.vs2026.amd64
297340
os: windows
298341
${{ else }}:
299342
name: NetCore1ESPool-Publishing-Internal
300-
demands: ImageOverride -equals windows.vs2022.amd64
343+
demands: ImageOverride -equals windows.vs2026.amd64
301344
steps:
302345
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
303346
parameters:
@@ -328,7 +371,7 @@ stages:
328371
scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1
329372
arguments: >
330373
-BuildId $(BARBuildId)
331-
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
374+
-PublishingInfraVersion 3
332375
-AzdoToken '$(System.AccessToken)'
333376
-WaitPublishingFinish true
334377
-RequireDefaultChannels ${{ parameters.requireDefaultChannels }}

‎eng/common/core-templates/post-build/setup-maestro-vars.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ steps:
88
- 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error
99

1010
- ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}:
11-
- task: DownloadBuildArtifacts@0
11+
- task: DownloadPipelineArtifact@2
1212
displayName: Download Release Configs
1313
inputs:
14-
buildType: current
1514
artifactName: ReleaseConfigs
16-
checkDownloadedFiles: true
15+
targetPath: '$(Build.StagingDirectory)/ReleaseConfigs'
1716

1817
- task: AzureCLI@2
1918
name: setReleaseVars

0 commit comments

Comments
 (0)