@@ -106,7 +106,7 @@ parameters:
106106 type : string
107107
108108jobs :
109- - job : ${{ parameters.buildName }}_${{ parameters.architecture }}
109+ - job : ${{ parameters.buildName }}_${{ parameters.architecture }}${{ replace(format('_BuildPass{0}', coalesce(parameters.buildPass, '1')), '_BuildPass1', '') }}
110110 pool : ${{ parameters.pool }}
111111
112112 # Currently, CodeQL slows the build down too much
@@ -117,9 +117,12 @@ jobs:
117117 timeoutInMinutes : 240
118118
119119 ${{ if ne(parameters.reuseBuildArtifactsFrom, '') }} :
120- # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status.
121- # The build shortcuts when stage 1 build fails and doesn't produce the SDK.
122- condition : succeededOrFailed()
120+ ${{ if eq(parameters.buildPass, '') }} :
121+ # Always attempt to run the bootstrap leg (e.g. even when stage 1 tests fail) in order to get a complete accessment of the build status.
122+ # The build shortcuts when stage 1 build fails and doesn't produce the SDK.
123+ condition : succeededOrFailed()
124+ ${{ else }} :
125+ condition : succeeded()
123126 dependsOn : ${{ parameters.reuseBuildArtifactsFrom }}
124127 variables :
125128 - ${{ if eq(variables['System.TeamProject'], 'internal') }} :
@@ -150,13 +153,6 @@ jobs:
150153 - name : sourcesPath
151154 value : $(vmrPath)
152155
153- - ${{ if ne(parameters.buildPass, '') }} :
154- - name : artifactsSuffix
155- value : ' _buildpass${{ parameters.buildPass }}'
156- - ${{ else }} :
157- - name : artifactsSuffix
158- value : ' '
159-
160156 templateContext :
161157 outputs :
162158 - output : pipelineArtifact
@@ -168,7 +164,7 @@ jobs:
168164
169165 - output : pipelineArtifact
170166 path : $(Build.ArtifactStagingDirectory)/publishing
171- artifact : $(Agent.JobName)_Artifacts$(artifactsSuffix)
167+ artifact : $(Agent.JobName)_Artifacts
172168 displayName : Publish Artifacts
173169 sbomEnabled : true
174170
@@ -207,15 +203,15 @@ jobs:
207203
208204${{ if ne(parameters.reuseBuildArtifactsFrom,'') }} :
209205 - ${{ each reuseBuildArtifacts in parameters.reuseBuildArtifactsFrom }} :
210- - download : current
211- artifact : ${{ reuseBuildArtifacts }}_Artifacts
212- patterns : |
213- **/Private.SourceBuilt.Artifacts.*.tar.gz
214- **/dotnet-sdk-*.tar.gz
215- **/*.nupkg
216- displayName : Download Previous Build (${{ reuseBuildArtifacts }})
217-
218206 - ${{ if eq(parameters.buildSourceOnly, true) }} :
207+ - download : current
208+ artifact : ${{ reuseBuildArtifacts }}_Artifacts
209+ patterns : |
210+ **/Private.SourceBuilt.Artifacts.*.tar.gz
211+ **/dotnet-sdk-*.tar.gz
212+ **/*.nupkg
213+ displayName : Download Previous Build (${{ reuseBuildArtifacts }})
214+
219215 - task : CopyFiles@2
220216 displayName : Copy Previous Build (${{ reuseBuildArtifacts }} - Source Build artifacts)
221217 inputs :
@@ -224,13 +220,16 @@ jobs:
224220 TargetFolder : $(sourcesPath)/prereqs/packages/archive/
225221
226222 - ${{ else }} :
223+ - download : current
224+ artifact : ${{ reuseBuildArtifacts }}_Artifacts
225+ displayName : Download Previous Build (${{ reuseBuildArtifacts }})
226+
227227 - task : CopyFiles@2
228- displayName : Copy Previous Build (${{ reuseBuildArtifacts }} - NuGet Packages )
228+ displayName : Copy Previous Build (${{ reuseBuildArtifacts }})
229229 inputs :
230- SourceFolder : $(Pipeline.Workspace)/${{ reuseBuildArtifacts }}_Artifacts/packages
231- Contents : ' **/*.nupkg'
230+ SourceFolder : $(Pipeline.Workspace)/${{ reuseBuildArtifacts }}_Artifacts/
232231 OverWrite : false
233- TargetFolder : $(sourcesPath)/artifacts/packages/
232+ TargetFolder : $(sourcesPath)/artifacts/
234233
235234 - ${{ if eq(parameters.withPreviousSDK, 'true') }} :
236235 - script : |
@@ -502,11 +501,6 @@ jobs:
502501 CopyWithRelativeFolders "artifacts/TestResults/" $targetFolder "Updated*.txt"
503502 CopyWithRelativeFolders "artifacts/TestResults/" $targetFolder "*.trx"
504503 }
505-
506- # check if we have assets to publish
507- if (Test-Path "artifacts/assets/Release/*") {
508- echo "##vso[task.setvariable variable=hasAssets]true"
509- }
510504 displayName: Prepare BuildLogs staging directory and check assets
511505 continueOnError: true
512506 condition: succeededOrFailed()
@@ -545,12 +539,6 @@ jobs:
545539 if [[ "${{ parameters.buildSourceOnly }}" == "True" ]]; then
546540 find artifacts/prebuilt-report/ -exec rsync -R {} -t ${targetFolder} \;
547541 fi
548-
549-
550- # check if we have assets to publish
551- if [ -n "$(ls -A 'artifacts/assets/Release/')" ]; then
552- echo "##vso[task.setvariable variable=hasAssets]true"
553- fi
554542 displayName: Prepare BuildLogs staging directory and check assets
555543 continueOnError: true
556544 condition: succeededOrFailed()
@@ -592,8 +580,8 @@ jobs:
592580 inputs :
593581 SourceFolder : $(sourcesPath)/artifacts
594582 Contents : |
595- VerticalManifest.xml
596583 assets/**
584+ manifests/**
597585TargetFolder : $(Build.ArtifactStagingDirectory)/publishing
598586 displayName : Copy artifacts to Artifact Staging Directory
599587
@@ -607,6 +595,6 @@ jobs:
607595
608596 - ${{ if or(ne(variables['System.TeamProject'], 'internal'), eq(variables['Build.Reason'], 'PullRequest')) }} :
609597 - publish : $(Build.ArtifactStagingDirectory)/publishing
610- artifact : $(Agent.JobName)_Artifacts$(artifactsSuffix)
598+ artifact : $(Agent.JobName)_Artifacts
611599 displayName : Publish Artifacts
612600 continueOnError : true
0 commit comments