Migrate eng/pipelines from PublishBuildArtifacts to PublishPipelineArtifact

eng/pipelines/common/download-artifact-step.yml

@@ -8,14 +8,12 @@ parameters:
 
 steps:
   # Download artifact
-  - task: DownloadBuildArtifacts@0
+  - task: DownloadPipelineArtifact@2
     displayName: 'Download ${{ parameters.displayName }}'
     inputs:
       buildType: current
-      downloadType: single
-      downloadPath: '$(Build.SourcesDirectory)/__download__'
       artifactName: '${{ parameters.artifactName }}'
-      checkDownloadedFiles: true
+      targetPath: '$(Build.SourcesDirectory)/__download__/${{ parameters.artifactName }}'
 
   # Unzip artifact
   - task: ExtractFiles@1

eng/pipelines/common/templates/browser-wasm-build-tests.yml

@@ -61,13 +61,12 @@ jobs:
 
         preBuildSteps:
           # Download single threaded runtime packs, and tasks needed to build WBT
-          - task: DownloadBuildArtifacts@0
+          - task: DownloadPipelineArtifact@2
             displayName: Download built nugets for singlethreaded runtime
             inputs:
               buildType: current
               artifactName: 'BuildArtifacts_browser_wasm_$(_hostedOs)_Release_SingleThreaded_BuildOnly'
-              downloadType: single
-              downloadPath: '$(Build.SourcesDirectory)/artifacts'
+              targetPath: '$(Build.SourcesDirectory)/artifacts/BuildArtifacts_browser_wasm_$(_hostedOs)_Release_SingleThreaded_BuildOnly'
 
           - task: CopyFiles@2
             displayName: Copy single threaded assets
@@ -77,13 +76,12 @@ jobs:
               CleanTargetFolder: false
 
           # Download for multi-threaded
-          - task: DownloadBuildArtifacts@0
+          - task: DownloadPipelineArtifact@2
             displayName: Download built nugets for multi-threaded runtime
             inputs:
               buildType: current
               artifactName: BuildArtifacts_browser_wasm_$(_hostedOs)_Release_MultiThreaded_BuildOnly
-              downloadType: single
-              downloadPath: '$(Build.SourcesDirectory)/artifacts'
+              targetPath: '$(Build.SourcesDirectory)/artifacts/BuildArtifacts_browser_wasm_$(_hostedOs)_Release_MultiThreaded_BuildOnly'
 
           - task: CopyFiles@2
             displayName: Copy multithreading runtime pack
@@ -97,13 +95,12 @@ jobs:
           # the CoreCLR browser-wasm runtime pack, so installing the workload for testing
           # requires the pack to be present in the local package feed.
           - ${{ if eq(parameters.includeCoreClrRuntimePack, true) }}:
-            - task: DownloadBuildArtifacts@0
+            - task: DownloadPipelineArtifact@2
               displayName: Download built nugets for CoreCLR runtime
               inputs:
                 buildType: current
                 artifactName: BuildArtifacts_browser_wasm_$(_hostedOs)_Release_CoreCLR
-                downloadType: single
-                downloadPath: '$(Build.SourcesDirectory)/artifacts'
+                targetPath: '$(Build.SourcesDirectory)/artifacts/BuildArtifacts_browser_wasm_$(_hostedOs)_Release_CoreCLR'
 
             - task: CopyFiles@2
               displayName: Copy CoreCLR runtime pack
@@ -114,13 +111,12 @@ jobs:
                 CleanTargetFolder: false
 
           # Download WBT
-          - task: DownloadBuildArtifacts@0
+          - task: DownloadPipelineArtifact@2
             displayName: Download Wasm.Build.Tests
             inputs:
               buildType: current
               artifactName: WasmBuildTests_$(_hostedOs)_SingleThreaded_BuildOnly
-              downloadType: single
-              downloadPath: '$(Build.SourcesDirectory)/artifacts'
+              targetPath: '$(Build.SourcesDirectory)/artifacts/WasmBuildTests_$(_hostedOs)_SingleThreaded_BuildOnly'
 
           - task: CopyFiles@2
             displayName: Copy Wasm.Build.Tests archive

eng/pipelines/common/templates/browser-wasm-coreclr-build-tests.yml

@@ -51,13 +51,12 @@ jobs:
 
         preBuildSteps:
           # Download single threaded runtime packs, and tasks needed to build WBT
-          - task: DownloadBuildArtifacts@0
+          - task: DownloadPipelineArtifact@2
             displayName: Download built nugets for singlethreaded runtime
             inputs:
               buildType: current
               artifactName: 'BuildArtifacts_browser_wasm_$(_hostedOs)_Release_CoreCLR'
-              downloadType: single
-              downloadPath: '$(Build.SourcesDirectory)/artifacts'
+              targetPath: '$(Build.SourcesDirectory)/artifacts/BuildArtifacts_browser_wasm_$(_hostedOs)_Release_CoreCLR'
 
           - task: CopyFiles@2
             displayName: Copy single threaded assets
@@ -67,13 +66,12 @@ jobs:
               CleanTargetFolder: false
 
           # Download for multi-threaded
-          # - task: DownloadBuildArtifacts@0
+          # - task: DownloadPipelineArtifact@2
           #   displayName: Download built nugets for multi-threaded runtime
           #   inputs:
           #     buildType: current
           #     artifactName: BuildArtifacts_browser_wasm_$(_hostedOs)_Release_MultiThreaded_BuildOnly
-          #     downloadType: single
-          #     downloadPath: '$(Build.SourcesDirectory)/artifacts'
+          #     targetPath: '$(Build.SourcesDirectory)/artifacts/BuildArtifacts_browser_wasm_$(_hostedOs)_Release_MultiThreaded_BuildOnly'
 
           # - task: CopyFiles@2
           #   displayName: Copy multithreading runtime pack
@@ -84,13 +82,12 @@ jobs:
           #     CleanTargetFolder: false
 
           # Download WBT - TODO-WASM: This points to "mono" build, altough 
-          - task: DownloadBuildArtifacts@0
+          - task: DownloadPipelineArtifact@2
             displayName: Download Wasm.Build.Tests
             inputs:
               buildType: current
               artifactName: WasmBuildTests_$(_hostedOs)_CoreCLR
-              downloadType: single
-              downloadPath: '$(Build.SourcesDirectory)/artifacts'
+              targetPath: '$(Build.SourcesDirectory)/artifacts/WasmBuildTests_$(_hostedOs)_CoreCLR'
 
           - task: CopyFiles@2
             displayName: Copy Wasm.Build.Tests archive

eng/pipelines/common/templates/publish-build-artifacts.yml → eng/pipelines/common/templates/publish-pipeline-artifacts.yml

@@ -11,12 +11,12 @@ parameters:
 
 steps:
   - ${{ if parameters.isOfficialBuild }}:
-    - task: 1ES.PublishBuildArtifacts@1
+    - task: 1ES.PublishPipelineArtifact@1
       displayName: ${{ parameters.displayName }}
       inputs: ${{ parameters.inputs }}
       condition: ${{ parameters.condition }}
   - ${{ else }}:
-    - task: PublishBuildArtifacts@1
+    - task: PublishPipelineArtifact@1
       displayName: ${{ parameters.displayName }}
       inputs: ${{ parameters.inputs }}
       condition: ${{ parameters.condition }}

eng/pipelines/common/templates/runtimes/run-test-job.yml

@@ -587,7 +587,7 @@ jobs:
           archiveType: $(archiveType)
           tarCompression: $(tarCompression)
           archiveExtension: $(archiveExtension)
-          artifactName: 'SuperPMI_Collection_$(CollectionName)_$(CollectionType)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+          artifactName: 'SuperPMI_Collection_$(CollectionName)_$(CollectionType)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_Attempt$(System.JobAttempt)'
           displayName: 'Upload artifacts SuperPMI $(CollectionName)-$(CollectionType) collection'
           condition: always()
 
@@ -627,7 +627,7 @@ jobs:
         displayName: Publish SuperPMI logs
         inputs:
           targetPath: $(SpmiLogsLocation)
-          artifactName: 'SuperPMI_Logs_$(CollectionName)_$(CollectionType)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+          artifactName: 'SuperPMI_Logs_$(CollectionName)_$(CollectionType)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_Attempt$(System.JobAttempt)'
         condition: always()
 
     ########################################################################################################

eng/pipelines/common/upload-artifact-step.yml

@@ -21,11 +21,11 @@ steps:
       includeRootFolder: ${{ parameters.includeRootFolder }}
     condition: ${{ parameters.condition }}
 
-  - template: /eng/pipelines/common/templates/publish-build-artifacts.yml
+  - template: /eng/pipelines/common/templates/publish-pipeline-artifacts.yml
     parameters:
       isOfficialBuild: ${{ parameters.isOfficialBuild }}
       displayName: 'Publish ${{ parameters.displayName }}'
       inputs:
-        PathtoPublish: $(Build.StagingDirectory)/${{ parameters.artifactName }}${{ parameters.archiveExtension }}
-        artifactName:  ${{ parameters.artifactName }}
+        targetPath:   $(Build.StagingDirectory)/${{ parameters.artifactName }}${{ parameters.archiveExtension }}
+        artifactName: ${{ parameters.artifactName }}
       condition: ${{ parameters.condition }}

eng/pipelines/common/upload-intermediate-artifacts-step.yml

@@ -13,11 +13,10 @@ steps:
     TargetFolder: '$(Build.StagingDirectory)/IntermediateArtifacts/${{ parameters.name }}'
     CleanTargetFolder: true
 
-- template: /eng/pipelines/common/templates/publish-build-artifacts.yml
+- template: /eng/pipelines/common/templates/publish-pipeline-artifacts.yml
   parameters:
     isOfficialBuild: ${{ parameters.isOfficialBuild }}
     displayName: Publish intermediate artifacts
     inputs:
-      PathtoPublish: '$(Build.StagingDirectory)/IntermediateArtifacts'
-      ArtifactName: IntermediateArtifacts
-      ArtifactType: container
+      targetPath: '$(Build.StagingDirectory)/IntermediateArtifacts'
+      artifactName: IntermediateArtifacts

eng/pipelines/common/wasm-post-build-steps.yml

@@ -24,13 +24,12 @@ steps:
       TargetFolder: '$(Build.StagingDirectory)/IntermediateArtifacts'
       CleanTargetFolder: true
 
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
     displayName: Publish intermediate artifacts
     condition: and(succeeded(), ${{ parameters.publishArtifactsForWorkload }})
     inputs:
-      pathToPublish: '$(Build.StagingDirectory)/IntermediateArtifacts'
+      targetPath: '$(Build.StagingDirectory)/IntermediateArtifacts'
       artifactName: BuildArtifacts_${{ parameters.osGroup }}_wasm_$(_hostedOs)_${{ parameters.buildConfig }}_${{ parameters.nameSuffix }}
-      artifactType: container
 
   - task: CopyFiles@2
     displayName: Copy WBT
@@ -41,10 +40,9 @@ steps:
       TargetFolder: '$(Build.StagingDirectory)/IntermediateArtifacts'
       CleanTargetFolder: true
 
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
     displayName: Publish Wasm.Build.Tests archive
     condition: and(succeeded(), ${{ parameters.publishWBT }})
     inputs:
-      pathToPublish: '$(Build.StagingDirectory)/IntermediateArtifacts'
+      targetPath: '$(Build.StagingDirectory)/IntermediateArtifacts'
       artifactName: WasmBuildTests_$(_hostedOs)_${{ parameters.nameSuffix }}
-      artifactType: container

eng/pipelines/coreclr/templates/run-superpmi-collect-job.yml

@@ -220,7 +220,7 @@ jobs:
         archiveType: $(archiveType)
         tarCompression: $(tarCompression)
         archiveExtension: $(archiveExtension)
-        artifactName: 'SuperPMI_Collection_$(CollectionName)_$(CollectionType)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)'
+        artifactName: 'SuperPMI_Collection_$(CollectionName)_$(CollectionType)_$(osGroup)$(osSubgroup)_$(archType)_$(buildConfig)_Attempt$(System.JobAttempt)'
         displayName: ${{ format('Upload artifacts SuperPMI {0}-{1} collection', parameters.collectionName, parameters.collectionType) }}
 
     - ${{ if eq(variables['System.TeamProject'], 'internal') }}:

eng/pipelines/libraries/superpmi-postprocess-step.yml

@@ -53,7 +53,7 @@ steps:
       archiveType: $(archiveType)
       tarCompression: $(tarCompression)
       archiveExtension: $(archiveExtension)
-      artifactName: 'SuperPMI_Collection_${{ parameters.SuperPmiCollectionName }}_${{ parameters.SuperPmiCollectionType }}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}'
+      artifactName: 'SuperPMI_Collection_${{ parameters.SuperPmiCollectionName }}_${{ parameters.SuperPmiCollectionType }}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}_Attempt$(System.JobAttempt)'
       displayName: 'Upload artifacts SuperPMI ${{ parameters.SuperPmiCollectionName }}-${{ parameters.SuperPmiCollectionType }} collection'
       condition: always()
 
@@ -93,5 +93,5 @@ steps:
     displayName: Publish SuperPMI logs
     inputs:
       targetPath: ${{ parameters.SpmiLogsLocation }}
-      artifactName: 'SuperPMI_Logs_${{ parameters.SuperPmiCollectionName }}_${{ parameters.SuperPmiCollectionType }}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}'
+      artifactName: 'SuperPMI_Logs_${{ parameters.SuperPmiCollectionName }}_${{ parameters.SuperPmiCollectionType }}_${{ parameters.osGroup }}${{ parameters.osSubgroup }}_${{ parameters.archType }}_${{ parameters.buildConfig }}_Attempt$(System.JobAttempt)'
     condition: always()

eng/pipelines/performance/templates/build-perf-maui-apps-net6.yml

@@ -180,47 +180,47 @@ steps:
     displayName: Build MAUI Blazor MacCatalyst
     workingDirectory: $(Build.SourcesDirectory)/MauiBlazorTesting
 
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
     displayName: 'Publish MauiAndroid binlog'
     condition: always()
     inputs:
-      pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiAndroid.binlog
-      artifactName:  ${{ parameters.artifactName }}
+      targetPath: $(Build.SourcesDirectory)/MauiTesting/MauiAndroid.binlog
+      artifactName:  ${{ parameters.artifactName }}_MauiAndroidBinlog_Attempt$(System.JobAttempt)
 
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
     displayName: 'Publish MauiiOS binlog'
     condition: always()
     inputs:
-      pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiiOS.binlog
-      artifactName:  ${{ parameters.artifactName }}
+      targetPath: $(Build.SourcesDirectory)/MauiTesting/MauiiOS.binlog
+      artifactName:  ${{ parameters.artifactName }}_MauiiOSBinlog_Attempt$(System.JobAttempt)
 
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
     displayName: 'Publish MauiMacCatalyst binlog'
     condition: always()
     inputs:
-      pathtoPublish: $(Build.SourcesDirectory)/MauiTesting/MauiMacCatalyst.binlog
-      artifactName:  ${{ parameters.artifactName }}
+      targetPath: $(Build.SourcesDirectory)/MauiTesting/MauiMacCatalyst.binlog
+      artifactName:  ${{ parameters.artifactName }}_MauiMacCatalystBinlog_Attempt$(System.JobAttempt)
 
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
     displayName: 'Publish MauiBlazoriOS binlog'
     condition: always()
     inputs:
-      pathtoPublish: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazoriOS.binlog
-      artifactName:  ${{ parameters.artifactName }}
+      targetPath: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazoriOS.binlog
+      artifactName:  ${{ parameters.artifactName }}_MauiBlazoriOSBinlog_Attempt$(System.JobAttempt)
 
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
     displayName: 'Publish MauiBlazorMacCatalyst binlog'
     condition: always()
     inputs:
-      pathtoPublish: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorMacCatalyst.binlog
-      artifactName:  ${{ parameters.artifactName }}
+      targetPath: $(Build.SourcesDirectory)/MauiBlazorTesting/MauiBlazorMacCatalyst.binlog
+      artifactName:  ${{ parameters.artifactName }}_MauiBlazorMacCatalystBinlog_Attempt$(System.JobAttempt)
 
-  - task: PublishBuildArtifacts@1
+  - task: PublishPipelineArtifact@1
     displayName: 'Publish MauiiOSPodcast binlog'
     condition: always()
     inputs:
-      pathtoPublish: $(Build.SourcesDirectory)/dotnet-podcasts/src/Mobile/MauiiOSPodcast.binlog
-      artifactName:  ${{ parameters.artifactName }}
+      targetPath: $(Build.SourcesDirectory)/dotnet-podcasts/src/Mobile/MauiiOSPodcast.binlog
+      artifactName:  ${{ parameters.artifactName }}_MauiiOSPodcastBinlog_Attempt$(System.JobAttempt)
 
   - template: /eng/pipelines/common/upload-artifact-step.yml
     parameters: