Skip to content

Commit d14d02d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[release/10.0.1xx] Source code updates from dotnet/arcade (#5960)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 7121050 commit d14d02d

26 files changed

Lines changed: 192 additions & 278 deletions

‎src/arcade/eng/Publishing.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<PropertyGroup>
99
<!-- Do not auto-generate symbol packages. Arcade embeds all PDBs so it's just waste of space -->
1010
<AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>
11+
<PublishingVersion>4</PublishingVersion>
1112
</PropertyGroup>
1213

1314
</Project>

‎src/arcade/eng/Version.Details.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-arcade dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26123.2</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26123.2</MicrosoftDotNetHelixSdkPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26177.7</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.26177.7</MicrosoftDotNetHelixSdkPackageVersion>
1111
<!-- dotnet-arcade-services dependencies -->
1212
<MicrosoftDotNetDarcLibPackageVersion>1.1.0-beta.25424.1</MicrosoftDotNetDarcLibPackageVersion>
1313
<MicrosoftDotNetProductConstructionServiceClientPackageVersion>1.1.0-beta.25424.1</MicrosoftDotNetProductConstructionServiceClientPackageVersion>

‎src/arcade/eng/Version.Details.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
<Uri>https://github.com/dotnet/templating</Uri>
2121
<Sha>43b5827697e501c442eb75ffff832cd4df2514fe</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26123.2">
23+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26177.7">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>4d898652733deb7dd274237ac06d27ee2ad85b36</Sha>
25+
<Sha>62dc2defffeadabf6761a9ed7e142692107330c0</Sha>
2626
</Dependency>
27-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26123.2">
27+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26177.7">
2828
<Uri>https://github.com/dotnet/arcade</Uri>
29-
<Sha>4d898652733deb7dd274237ac06d27ee2ad85b36</Sha>
29+
<Sha>62dc2defffeadabf6761a9ed7e142692107330c0</Sha>
3030
</Dependency>
3131
<Dependency Name="Microsoft.DotNet.ProductConstructionService.Client" Version="1.1.0-beta.25424.1">
3232
<Uri>https://github.com/dotnet/arcade-services</Uri>
@@ -174,4 +174,4 @@
174174
<Sha>0a2e291c0d9c0c7675d445703e51750363a549ef</Sha>
175175
</Dependency>
176176
</ToolsetDependencies>
177-
</Dependencies>
177+
</Dependencies>

‎src/arcade/eng/build.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,17 @@ stages:
2222
publish:
2323
artifacts: true
2424
logs: true
25-
manifests: true
2625
enableMicrobuild: true
2726
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
27+
enablePublishBuildAssets: true
2828
enableSourceIndex: true
2929
enableSourceBuild: true
30+
publishingVersion: 4
3031
workspace:
3132
clean: all
3233
jobs:
3334
- job: Windows_NT
35+
enablePublishing: true
3436
timeoutInMinutes: 90
3537
strategy:
3638
matrix:
@@ -62,7 +64,7 @@ stages:
6264

6365
- template: /eng/common/templates-official/post-build/post-build.yml@self
6466
parameters:
65-
publishingInfraVersion: 3
67+
publishingInfraVersion: 4
6668
# signing validation will not run, even if the below value is 'true', if the 'PostBuildSign' variable is set to 'true'
6769
enableSigningValidation: false
6870
# Sourcelink validation isn't passing for Arcade due to some regressions. This should be

‎src/arcade/eng/common-variables.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@ variables:
2828
- group: Publish-Build-Assets
2929
- group: DotNet-HelixApi-Access
3030
- group: SDL_Settings
31-
# DotNetPublishUsingPipelines can be removed when Arcade itself consumes a new Arcade version.
3231
- name: _InternalBuildArgs
3332
value: /p:DotNetSignType=${{ parameters.signType }}
3433
/p:TeamName=$(_TeamName)
35-
/p:DotNetPublishUsingPipelines=true
3634
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
3735
- name: PostBuildSign
3836
value: true

‎src/arcade/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:

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -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'

‎src/arcade/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 }}:

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

Lines changed: 74 additions & 31 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
@@ -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
@@ -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
@@ -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
@@ -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 }}

‎src/arcade/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)