Use 1ES templateContext for workloads upload (#109647)

Fixes #60687

Author: akoeplinger

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

@@ -1,13 +1,10 @@
 parameters:
   name: ''
-  publishPackagesCondition: always()
-  publishVSSetupCondition: false
   isOfficialBuild: true
 
 steps:
 - task: CopyFiles@2
   displayName: Prepare job-specific intermediate artifacts subdirectory
-  condition: and(succeeded(), ${{ parameters.publishPackagesCondition }})
   inputs:
     SourceFolder: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)'
     Contents: |
@@ -16,16 +13,6 @@ steps:
     TargetFolder: '$(Build.StagingDirectory)/IntermediateArtifacts/${{ parameters.name }}'
     CleanTargetFolder: true
 
-- task: CopyFiles@2
-  displayName: Prepare job-specific intermediate artifacts subdirectory
-  condition: and(succeeded(), ${{ parameters.publishVSSetupCondition }})
-  inputs:
-    SourceFolder: '$(Build.SourcesDirectory)/artifacts/VSSetup/$(_BuildConfig)'
-    Contents: |
-      Insertion/**/*
-    TargetFolder: '$(Build.StagingDirectory)/IntermediateArtifacts/${{ parameters.name }}'
-    CleanTargetFolder: true
-
 - template: /eng/pipelines/common/templates/publish-build-artifacts.yml
   parameters:
     isOfficialBuild: ${{ parameters.isOfficialBuild }}

eng/pipelines/runtime-official.yml

@@ -580,24 +580,37 @@ extends:
             buildArgs: -s mono.workloads -c $(_BuildConfig) /p:PackageSource=$(Build.SourcesDirectory)/artifacts/workloadPackages /p:WorkloadOutputPath=$(Build.SourcesDirectory)/artifacts/workloads
 
             postBuildSteps:
-            # Upload packages wrapping msis
-            - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
-              parameters:
-                name: workloads
-
-            # Delete wixpdb files before they are uploaded to artifacts
-            - task: DeleteFiles@1
-              displayName: Delete wixpdb's
+            # Prepare packages wrapping msis
+            - task: CopyFiles@2
+              displayName: Prepare package artifacts
               inputs:
-                SourceFolder: $(Build.SourcesDirectory)/artifacts/workloads
-                Contents: '*.wixpdb'
+                SourceFolder: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)'
+                Contents: |
+                  Shipping/**/*
+                  NonShipping/**/*
+                TargetFolder: '$(Build.ArtifactStagingDirectory)/IntermediateArtifacts1/workloads'
+                CleanTargetFolder: true
 
-            # Upload artifacts to be used for generating VS components
-            - template: /eng/pipelines/common/upload-intermediate-artifacts-step.yml
-              parameters:
-                name: workloads-vs
-                publishPackagesCondition: false
-                publishVSSetupCondition: always()
+            # Prepare artifacts to be used for generating VS components
+            - task: CopyFiles@2
+              displayName: Prepare VS Insertion artifacts
+              inputs:
+                SourceFolder: '$(Build.SourcesDirectory)/artifacts/VSSetup/$(_BuildConfig)'
+                Contents: |
+                  Insertion/**/*
+                TargetFolder: '$(Build.ArtifactStagingDirectory)/IntermediateArtifacts2/workloads-vs'
+                CleanTargetFolder: true
+
+            templateContext:
+              outputs:
+              - output: buildArtifacts
+                PathtoPublish: '$(Build.ArtifactStagingDirectory)/IntermediateArtifacts1'
+                ArtifactName: IntermediateArtifacts
+                displayName: 'Publish workload packages'
+              - output: buildArtifacts
+                PathtoPublish: '$(Build.ArtifactStagingDirectory)/IntermediateArtifacts2'
+                ArtifactName: IntermediateArtifacts
+                displayName: 'Publish workload VS Insertion artifacts'
 
             isOfficialBuild: ${{ variables.isOfficialBuild }}
             timeoutInMinutes: 120