Revert some changes to build-appx

microsoft · Mar 23, 2022 · 5d2d914 · 5d2d914
1 parent e570173
commit 5d2d914
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/pipelines/templates/common.yml b/pipelines/templates/common.yml
@@ -48,13 +48,12 @@ steps:
         ProjectName: MixedRealityToolkit
         Architectures: [x86]
         BuildFolderPath: $(Agent.TempDirectory)/build/uwp
-        OutputPath: $(Build.ArtifactStagingDirectory)/mrtk-build-uwp-x86
 
     - task: PublishBuildArtifacts@1
       displayName: Publish x86 AppX
       inputs:
         ArtifactName: mrtk-build-x86
-        PathToPublish: $(Build.ArtifactStagingDirectory)/mrtk-build-uwp-x86
+        PathToPublish: $(Build.ArtifactStagingDirectory)/Apps/uwp-x86
 
   # Build UWP ARM.
   - ${{ if eq(parameters.buildUWPArm, true) }}:
@@ -63,13 +62,12 @@ steps:
         ProjectName: MixedRealityToolkit
         Architectures: [ARM]
         BuildFolderPath: $(Agent.TempDirectory)/build/uwp
-        OutputPath: $(Build.ArtifactStagingDirectory)/mrtk-build-uwp-arm
 
     - task: PublishBuildArtifacts@1
       displayName: Publish ARM AppX
       inputs:
         ArtifactName: mrtk-build-arm
-        PathToPublish: $(Build.ArtifactStagingDirectory)/mrtk-build-uwp-arm
+        PathToPublish: $(Build.ArtifactStagingDirectory)/Apps/uwp-arm
 
   # Build UWP ARM64.
   - ${{ if eq(parameters.buildUWPArm64, true) }}:
@@ -78,10 +76,9 @@ steps:
         ProjectName: MixedRealityToolkit
         Architectures: [ARM64]
         BuildFolderPath: $(Agent.TempDirectory)/build/uwp
-        OutputPath: $(Build.ArtifactStagingDirectory)/mrtk-build-uwp-arm64
 
     - task: PublishBuildArtifacts@1
       displayName: Publish ARM64 AppX
       inputs:
         ArtifactName: mrtk-build-arm64
-        PathToPublish: $(Build.ArtifactStagingDirectory)/mrtk-build-uwp-arm64
+        PathToPublish: $(Build.ArtifactStagingDirectory)/Apps/uwp-arm64
diff --git a/pipelines/templates/tasks/build-appx.yaml b/pipelines/templates/tasks/build-appx.yaml
@@ -11,9 +11,6 @@ parameters:
 - name: BuildFolderPath
   type: string
 
-- name: OutputPath
-  type: string
-
 steps:
 - ${{ each arch in parameters.Architectures }}:
   - task: MSBuild@1
@@ -24,7 +21,7 @@ steps:
       configuration: Master
 
   - task: CopyFiles@2
-    displayName: Copy ${{ arch }} AppX to ${{ parameters.OutputPath }}
+    displayName: Copy ${{ arch }} AppX to artifacts staging directory
     inputs:
       sourceFolder: ${{ parameters.BuildFolderPath }}/AppPackages/${{ parameters.ProjectName }}/${{ parameters.ProjectName }}_$(MRTKVersion).0_${{ arch }}_Master_Test
-      targetFolder: ${{ parameters.OutputPath }}
+      targetFolder: $(Build.ArtifactStagingDirectory)/Apps/uwp-${{ arch }}