@@ -219,7 +219,7 @@ jobs:
219219 value : $(commandPrefix)ci $(commandPrefix)$(cleanArgument) $(commandPrefix)prepareMachine -c ${{ parameters.configuration }}
220220
221221 - name : baseProperties
222- value : $(officialBuildParameter) /p:VerticalName=$(Agent.JobName) /p:ArtifactsStagingDir=$(artifactsStagingDir)
222+ value : $(officialBuildParameter) /p:VerticalName=$(Agent.JobName)
223223
224224 - name : targetProperties
225225 ${{ if and(ne(parameters.targetOS, ''), ne(parameters.targetArchitecture, '')) }} :
@@ -295,14 +295,14 @@ jobs:
295295 # This prevents overwrite conflicts in the event of a failed build followed by a rerun.
296296 # Additionally, the 'Download Previous Build *' steps depend on a fixed name to acquire specific assets in multi-stage builds.
297297 - output : pipelineArtifact
298- path : $(artifactsStagingDir )
298+ path : $(Build.ArtifactStagingDirectory )
299299 artifact : $(successfulJobArtifactName)
300300 displayName : Publish Artifacts (On Success)
301301 condition : succeeded()
302302 sbomEnabled : true
303303
304304 - output : pipelineArtifact
305- path : $(artifactsStagingDir )
305+ path : $(Build.ArtifactStagingDirectory )
306306 artifact : $(failedJobArtifactName)
307307 displayName : Publish Artifacts (On Failure)
308308 condition : failed()
@@ -311,7 +311,7 @@ jobs:
311311 # Using build artifacts to enable publishing the vertical manifests to a single artifact from different jobs
312312 - ${{ if ne(parameters.buildSourceOnly, true) }} :
313313 - output : buildArtifacts
314- PathtoPublish : $(artifactsStagingDir )/manifests/${{ parameters.configuration }}/$(Agent.JobName).xml
314+ PathtoPublish : $(Build.ArtifactStagingDirectory )/manifests/${{ parameters.configuration }}/$(Agent.JobName).xml
315315 ArtifactName : VerticalManifests
316316 displayName : Publish Vertical Manifest
317317 sbomEnabled : false
@@ -433,6 +433,7 @@ jobs:
433433 $(baseArguments)
434434 $(signArguments)
435435 $(baseProperties)
436+ /p:ArtifactsStagingDir=$(Build.ArtifactStagingDirectory)
436437 $(targetProperties)
437438 $(signProperties)
438439 $(buildPassProperties)
@@ -508,7 +509,7 @@ jobs:
508509 customEnvVars=""
509510 customPreBuildArgs=""
510511 customBuildArgs="$(baseArguments) $(signArguments) $(_SignDiagnosticFilesArgs)"
511- extraBuildProperties="$(baseProperties) $(targetProperties) $(signProperties) $(buildPassProperties) ${{ parameters.extraProperties }}"
512+ extraBuildProperties="$(baseProperties) /p:ArtifactsStagingDir=$(Build.ArtifactStagingDirectory) $(targetProperties) $(signProperties) $(buildPassProperties) ${{ parameters.extraProperties }}"
512513
513514 if [[ '${{ parameters.runOnline }}' == 'True' ]]; then
514515 customBuildArgs="$customBuildArgs --online"
@@ -561,7 +562,7 @@ jobs:
561562 - script : |
562563 set -ex
563564 # Update the owner of the staging directory to the current user
564- sudo chown -R $(whoami) $(artifactsStagingDir )
565+ sudo chown -R $(whoami) $(Build.ArtifactStagingDirectory )
565566 displayName: Update owner of artifacts staging directory
566567
567568 # Only run tests if enabled
@@ -585,7 +586,7 @@ jobs:
585586
586587 customPreBuildArgs=''
587588 customBuildArgs="--test --excludeCIBinarylog /bl:artifacts/log/Release/Test.binlog $(baseArguments)"
588- extraBuildProperties="$(baseProperties) $(targetProperties) ${{ parameters.extraProperties }}"
589+ extraBuildProperties="$(baseProperties) /p:ArtifactsStagingDir=$(Build.ArtifactStagingDirectory) $(targetProperties) ${{ parameters.extraProperties }}"
589590
590591 if [[ '${{ parameters.runOnline }}' == 'False' ]]; then
591592 customPreBuildArgs="$customPreBuildArgs sudo"
@@ -680,13 +681,13 @@ jobs:
680681 # Both publishing steps are necessary to ensure artifacts are published on both success and failure.
681682 # This prevents overwrite conflicts in the event of a failed build followed by a rerun.
682683 # Additionally, the 'Download Previous Build *' steps depend on a fixed name to acquire specific assets in multi-stage builds.
683- - publish : $(artifactsStagingDir )
684+ - publish : $(Build.ArtifactStagingDirectory )
684685 artifact : $(successfulJobArtifactName)
685686 displayName : Publish Artifacts (On Success)
686687 condition : succeeded()
687688 continueOnError : true
688689
689- - publish : $(artifactsStagingDir )
690+ - publish : $(Build.ArtifactStagingDirectory )
690691 artifact : $(failedJobArtifactName)
691692 displayName : Publish Artifacts (On Failure)
692693 condition : failed()
@@ -696,6 +697,6 @@ jobs:
696697 - ${{ if ne(parameters.buildSourceOnly, true) }} :
697698 - task : PublishBuildArtifacts@1
698699 inputs :
699- PathtoPublish : $(artifactsStagingDir )/manifests/${{ parameters.configuration }}/$(Agent.JobName).xml
700+ PathtoPublish : $(Build.ArtifactStagingDirectory )/manifests/${{ parameters.configuration }}/$(Agent.JobName).xml
700701 ArtifactName : VerticalManifests
701702 displayName : Publish Vertical Manifest
0 commit comments