Update build-appx.yaml

microsoft · Jun 23, 2022 · 9e5e098 · 9e5e098
1 parent 9e42d9a
commit 9e5e098
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pipelines/templates/common.yml b/pipelines/templates/common.yml
@@ -50,6 +50,7 @@ steps:
         ProjectName: MixedRealityToolkit
         Architectures: [x86]
         BuildFolderPath: $(Agent.TempDirectory)/build/uwp
+        Version: $(MRTKVersion)
 
     - task: PublishBuildArtifacts@1
       displayName: Publish x86 AppX
@@ -64,6 +65,7 @@ steps:
         ProjectName: MixedRealityToolkit
         Architectures: [ARM]
         BuildFolderPath: $(Agent.TempDirectory)/build/uwp
+        Version: $(MRTKVersion)
 
     - task: PublishBuildArtifacts@1
       displayName: Publish ARM AppX
@@ -78,6 +80,7 @@ steps:
         ProjectName: MixedRealityToolkit
         Architectures: [ARM64]
         BuildFolderPath: $(Agent.TempDirectory)/build/uwp
+        Version: $(MRTKVersion)
 
     - task: PublishBuildArtifacts@1
       displayName: Publish ARM64 AppX

diff --git a/pipelines/templates/tasks/build-appx.yaml b/pipelines/templates/tasks/build-appx.yaml
@@ -14,6 +14,9 @@ parameters:
 - name: BuildFolderPath
   type: string
 
+- name: Version
+  type: string
+
 steps:
 - ${{ each arch in parameters.Architectures }}:
   - task: MSBuild@1
@@ -27,7 +30,7 @@ steps:
     displayName: Copy ${{ arch }} AppX to artifacts staging directory
     inputs:
       ${{ if eq(arch, 'x86') }}:
-        sourceFolder: ${{ parameters.BuildFolderPath }}/AppPackages/${{ parameters.ProjectName }}/${{ parameters.ProjectName }}_$(MRTKVersion).0_Win32_Master_Test
+        sourceFolder: ${{ parameters.BuildFolderPath }}/AppPackages/${{ parameters.ProjectName }}/${{ parameters.ProjectName }}_${{ parameters.Version }}.0_Win32_Master_Test
       ${{ if not(eq(arch, 'x86')) }}:
-        sourceFolder: ${{ parameters.BuildFolderPath }}/AppPackages/${{ parameters.ProjectName }}/${{ parameters.ProjectName }}_$(MRTKVersion).0_${{ arch }}_Master_Test
+        sourceFolder: ${{ parameters.BuildFolderPath }}/AppPackages/${{ parameters.ProjectName }}/${{ parameters.ProjectName }}_${{ parameters.Version }}.0_${{ arch }}_Master_Test
       targetFolder: $(Build.ArtifactStagingDirectory)/Apps/uwp-${{ arch }}