Skip to content

Commit 564729b

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0.3xx] Source code updates from dotnet/dotnet (#1666)
[release/10.0.3xx] Source code updates from dotnet/dotnet
1 parent f26b6d9 commit 564729b

25 files changed

Lines changed: 209 additions & 287 deletions

‎NuGet.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,20 @@
22
<configuration>
33
<packageSources>
44
<clear />
5+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<!-- Begin: Package sources from dotnet-dotnet -->
7+
<!-- End: Package sources from dotnet-dotnet -->
8+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
59
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
610
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
711
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
812
<add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
913
</packageSources>
1014
<disabledPackageSources>
1115
<clear />
16+
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
17+
<!-- Begin: Package sources from dotnet-dotnet -->
18+
<!-- End: Package sources from dotnet-dotnet -->
19+
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1220
</disabledPackageSources>
1321
</configuration>

‎eng/Version.Details.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26176.111</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<SystemCommandLinePackageVersion>2.0.0</SystemCommandLinePackageVersion>
11-
<SystemIOHashingPackageVersion>10.0.0-rc.2.25502.107</SystemIOHashingPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26227.122</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<SystemCommandLinePackageVersion>2.0.7</SystemCommandLinePackageVersion>
11+
<SystemIOHashingPackageVersion>10.0.7</SystemIOHashingPackageVersion>
1212
</PropertyGroup>
1313
<!--Property group for alternate package version names-->
1414
<PropertyGroup>

‎eng/Version.Details.xml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="42d6a4c2c669419a1f10edac6999d02dc2c204ac" BarId="307977" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="sourcelink" Sha="40451fd17068c5428329f3807cd854e3a9a5a3c4" BarId="312168" />
44
<ProductDependencies>
5-
<Dependency Name="System.CommandLine" Version="2.0.0">
6-
<Uri>https://github.com/dotnet/dotnet</Uri>
7-
<Sha>3a0c62bf027fbcb8683a13e78a5b21ae19028ca3</Sha>
5+
<Dependency Name="System.CommandLine" Version="2.0.7">
6+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
7+
<Sha>b16286c2284fecf303dbc12a0bb152476d662e44</Sha>
88
</Dependency>
9-
<Dependency Name="System.IO.Hashing" Version="10.0.0-rc.2.25502.107">
10-
<Uri>https://github.com/dotnet/dotnet</Uri>
11-
<Sha>be28ec777bf12db631725399c442448d52093087</Sha>
9+
<Dependency Name="System.IO.Hashing" Version="10.0.7">
10+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
11+
<Sha>b16286c2284fecf303dbc12a0bb152476d662e44</Sha>
1212
</Dependency>
1313
</ProductDependencies>
1414
<ToolsetDependencies>
15-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26176.111">
15+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26227.122">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>42d6a4c2c669419a1f10edac6999d02dc2c204ac</Sha>
17+
<Sha>40451fd17068c5428329f3807cd854e3a9a5a3c4</Sha>
1818
</Dependency>
1919
</ToolsetDependencies>
2020
</Dependencies>

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<Import Project="Version.Details.props" />
44

55
<PropertyGroup>
6-
<VersionPrefix>10.0.300</VersionPrefix>
7-
<PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
6+
<VersionPrefix>10.0.301</VersionPrefix>
7+
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
88
<PreReleaseVersionIteration></PreReleaseVersionIteration>
99
<!-- Allowed values: '', 'prerelease', 'release'. Set to 'release' when stabilizing. -->
1010
<DotNetFinalVersionKind></DotNetFinalVersionKind>

‎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/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 }}

0 commit comments

Comments
 (0)