Relabel the MSI build option and reorder

windows-release/azure-pipelines.yml

@@ -78,10 +78,10 @@ parameters:
   displayName: "Produce full layout artifact"
   type: boolean
   default: true
-- name: DoMSIX
-  displayName: "Produce Store packages (3.13 and earlier)"
+- name: DoPyManager
+  displayName: "Produce PyManager package"
   type: boolean
-  default: false
+  default: true
 - name: DoNuget
   displayName: "Produce Nuget packages"
   type: boolean
@@ -91,17 +91,17 @@ parameters:
   type: boolean
   default: true
 - name: DoMSI
-  displayName: "Produce EXE/MSI installer"
+  displayName: "Produce EXE/MSI installer (3.15 and earlier)"
   type: boolean
   default: true
 - name: TestMSI
-  displayName: "Run EXE/MSI installer tests"
+  displayName: "Run EXE/MSI installer tests (if built)"
   type: boolean
   default: true
-- name: DoPyManager
-  displayName: "Produce PyManager package"
+- name: DoMSIX
+  displayName: "Produce Store packages (3.13 and earlier)"
   type: boolean
-  default: true
+  default: false
 - name: BuildToPublish
   displayName: "Republish a build (select in Resources)"
   type: string

windows-release/stage-build.yml

@@ -45,6 +45,9 @@ jobs:
   workspace:
     clean: all
 
+  variables:
+    PreferredToolArchitecture: x64
+
   strategy:
     matrix:
       win32:
@@ -191,6 +194,9 @@ jobs:
     workspace:
       clean: all
 
+    variables:
+      PreferredToolArchitecture: x64
+
     strategy:
       matrix:
         amd64:
@@ -320,6 +326,7 @@ jobs:
       variables:
         Platform: ARM64
         _HostPython: python
+        PreferredToolArchitecture: x64
 
       strategy:
         matrix: