Merge remote-tracking branch 'origin/master'

Author: crramirez

azure-pipelines.yml

@@ -87,33 +87,28 @@ steps:
     maximumCpuCount: true
     msbuildArchitecture: 'x64'
 
+- task: DeleteFiles@1
+  inputs:
+    Contents: |
+      ARM64\install.tar.gz
+      x64\install.tar.gz
 - task: CopyFiles@2
   inputs:
     SourceFolder: '$(appxPackageDir)'
     Contents: '**\*bundle.msixupload'
     TargetFolder: '$(Build.ArtifactStagingDirectory)'
-- task: CopyFiles@2
+- task: DeleteFiles@1
   inputs:
     SourceFolder: '$(appxPackageDir)'
-    Contents: '**\*.msixbundle'
-    TargetFolder: '$(Build.ArtifactStagingDirectory)'
+    Contents: |
+      **\*bundle.msixupload
+      **\*.msixbundle
 - task: PublishBuildArtifacts@1
   inputs:
     PathtoPublish: '$(Build.ArtifactStagingDirectory)'
     ArtifactName: 'drop'
     publishLocation: 'Container'
 
-- task: DeleteFiles@1
-  inputs:
-    SourceFolder: '$(appxPackageDir)'
-    Contents: '**\*.msixbundle'
-- task: DeleteFiles@1
-  inputs:
-    Contents: 'x64\install.tar.gz'
-- task: DeleteFiles@1
-  inputs:
-    Contents: 'ARM64\install.tar.gz'
-
 - task: store-flight@0
   continueOnError: true
   timeoutInMinutes: 10