Rearrange and add queue parameter

Author: zooba

ci/release.yml

@@ -19,6 +19,10 @@ parameters:
   displayName: "Auto-update users to this release"
   type: boolean
   default: false
+- name: PublishStore
+  displayName: "Also publish to the Store"
+  type: boolean
+  default: false
 - name: PreTest
   displayName: "Pre test"
   type: boolean
@@ -307,18 +311,7 @@ stages:
         displayName: 'Remove MSIX'
 
     - ${{ if eq(parameters.Publish, 'true') }}:
-      - task: UseMSStoreCLI@0
-        displayName: Setup Microsoft Store Developer CLI
-
       - ${{ if eq(parameters.Sign, 'true') }}:
-        - powershell: >
-            msstore reconfigure
-            --tenantId $(MSSTORE_TENANT_ID)
-            --sellerId $(MSSTORE_SELLER_ID)
-            --clientId $(MSSTORE_CLIENT_ID)
-            --clientSecret $(MSSTORE_CLIENT_SECRET)
-          displayName: Authenticate Store CLI
-
         - task: DownloadSecureFile@1
           name: sshkey
           inputs:
@@ -331,6 +324,13 @@ stages:
         workingDirectory: $(Pipeline.Workspace)
         displayName: 'Download PuTTY binaries'
 
+      - powershell: |
+          mv "${env:UPLOAD_DIR}\*-store.msix*" (mkdir -Force ${env:STORE_UPLOAD_DIR}) -Verbose
+        displayName: 'Move Store packages'
+        env:
+          UPLOAD_DIR: $(DIST_DIR)
+          STORE_UPLOAD_DIR: $(STORE_DIST_DIR)
+
       - ${{ if ne(parameters.PublishAppinstaller, 'true') }}:
         - powershell: |
             "Not uploading these files:"
@@ -340,26 +340,31 @@ stages:
           env:
             UPLOAD_DIR: $(DIST_DIR)
 
-      - powershell: |
-          mv "${env:UPLOAD_DIR}\*-store.msix*" (mkdir -Force ${env:STORE_UPLOAD_DIR}) -Verbose
-        displayName: 'Move Store packages'
-        env:
-          UPLOAD_DIR: $(DIST_DIR)
-          STORE_UPLOAD_DIR: $(STORE_DIST_DIR)
+      - ${{ if eq(parameters.PublishStore, 'true') }}:
+        - task: UseMSStoreCLI@0
+          displayName: Setup Microsoft Store Developer CLI
 
-      # We begin the submission but do not complete it, so the RM has a chance
-      # to update metadata before going public. It also means we can do this
-      # whether signed or not, since a test release can simply be deleted rather
-      # than published. Existing drafts will be overwritten with new ones.
-      - powershell: |
-          $msix = Get-Item "${env:STORE_UPLOAD_DIR}\*.msixupload"
-          "Uploading $msix"
-          msstore publish -v -nc -id "${{ parameters.StoreAppId }}" $msix
-          "MSIX is uploaded."
-          "Finish publishing at https://partner.microsoft.com/en-us/dashboard/products/${{ parameters.StoreAppId }}/overview"
-        displayName: 'Begin Store submission'
-        env:
-          STORE_UPLOAD_DIR: $(STORE_DIST_DIR)
+        - powershell: >
+            msstore reconfigure
+            --tenantId $(MSSTORE_TENANT_ID)
+            --sellerId $(MSSTORE_SELLER_ID)
+            --clientId $(MSSTORE_CLIENT_ID)
+            --clientSecret $(MSSTORE_CLIENT_SECRET)
+          displayName: Authenticate Store CLI
+
+        # We begin the submission but do not complete it, so the RM has a chance
+        # to update metadata before going public. It also means we can do this
+        # whether signed or not, since a test release can simply be deleted rather
+        # than published. Existing drafts will be overwritten with new ones.
+        - powershell: |
+            $msix = Get-Item "${env:STORE_UPLOAD_DIR}\*.msixupload"
+            "Uploading $msix"
+            msstore publish -v -nc -id "${{ parameters.StoreAppId }}" $msix
+            "MSIX is uploaded."
+            "Finish publishing at https://partner.microsoft.com/en-us/dashboard/products/${{ parameters.StoreAppId }}/overview"
+          displayName: 'Begin Store submission'
+          env:
+            STORE_UPLOAD_DIR: $(STORE_DIST_DIR)
 
       - powershell: |
           python ci\upload.py