From 0cbf583e8b1b8bb6f7baf6d9b9f150693d6b001d Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Fri, 17 Oct 2025 13:09:12 -0700
Subject: [PATCH 1/5] Update WindowsAppSDK-Foundation-Official.yml

---
 build/WindowsAppSDK-Foundation-Official.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build/WindowsAppSDK-Foundation-Official.yml b/build/WindowsAppSDK-Foundation-Official.yml
index 23fa3b7689..f7d1923351 100644
--- a/build/WindowsAppSDK-Foundation-Official.yml
+++ b/build/WindowsAppSDK-Foundation-Official.yml
@@ -42,10 +42,9 @@ parameters:
   type: boolean
   default: true
 - name: "TestOnArm64"
-  displayName: "Enable running of tests on arm64 platform (Default: false)"
+  displayName: "Enable running of tests on arm64 platform (Default: true)"
   type: boolean
-  # Temporarily default to not testing on arm64 to mitigate arm64 capacity shortage problem.
-  default: false
+  default: true
 - name: "MaestroDependOnTestSamples"
   displayName: "Whether Maestro publishing should depend on successful Sample tests"
   type: boolean

From 026859c18255996b81259a71517ae4d8331fa65a Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Fri, 17 Oct 2025 13:09:38 -0700
Subject: [PATCH 2/5] Enable tests on arm64 platform by default

---
 build/WindowsAppSDK-Foundation-Nightly.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build/WindowsAppSDK-Foundation-Nightly.yml b/build/WindowsAppSDK-Foundation-Nightly.yml
index fad98dda5c..c272dab551 100644
--- a/build/WindowsAppSDK-Foundation-Nightly.yml
+++ b/build/WindowsAppSDK-Foundation-Nightly.yml
@@ -42,10 +42,9 @@ parameters:
   type: boolean
   default: true
 - name: "TestOnArm64"
-  displayName: "Enable running of tests on arm64 platform (Default: false)"
+  displayName: "Enable running of tests on arm64 platform (Default: true)"
   type: boolean
-  # Temporarily default to not testing on arm64 to mitigate arm64 capacity shortage problem.
-  default: false
+  default: true
 - name: "MaestroDependOnTestSamples"
   displayName: "Whether Maestro publishing should depend on successful Sample tests"
   type: boolean

From 73c5abf5410c0938973efd9f8fdfc871c0f33096 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Fri, 17 Oct 2025 13:11:17 -0700
Subject: [PATCH 3/5] Change default for TestOnArm64 to false

---
 build/AzurePipelinesTemplates/WindowsAppSDK-Publish-Stage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-Publish-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-Publish-Stage.yml
index 6dd3c7c846..320ba02b00 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-Publish-Stage.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-Publish-Stage.yml
@@ -10,7 +10,7 @@ parameters:
   type: boolean
   default: false
 - name: "TestOnArm64"
-  displayName: "Enable running of sample tests on arm64 platform (Default: true)"
+  displayName: "Enable running of sample tests on arm64 platform (Default: false)"
   type: boolean
   default: false
 - name: "MaestroDependOnTestSamples"

From b604b30a8850c12b3318ddabf8888beea0d786ed Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Fri, 17 Oct 2025 13:13:08 -0700
Subject: [PATCH 4/5] Add parameter for testing on ARM64 architecture

---
 build/AzurePipelinesTemplates/WindowsAppSDK-Test-Stage.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-Test-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-Test-Stage.yml
index 301db18b5a..a29595847d 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-Test-Stage.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-Test-Stage.yml
@@ -1,3 +1,8 @@
+parameters:
+- name: "TestOnArm64"
+  type: boolean
+  default: false
+
 stages:
 - stage: Test_x86
   dependsOn: Build_x86

From 1d07ba667f97caf721af7ac30b19ecbf0bd345aa Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Fri, 17 Oct 2025 14:16:58 -0700
Subject: [PATCH 5/5] Update WindowsAppSDK-Test-Stage.yml

---
 build/AzurePipelinesTemplates/WindowsAppSDK-Test-Stage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-Test-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-Test-Stage.yml
index a29595847d..b9b9a92cfd 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-Test-Stage.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-Test-Stage.yml
@@ -1,7 +1,7 @@
 parameters:
 - name: "TestOnArm64"
   type: boolean
-  default: false
+  default: true
 
 stages:
 - stage: Test_x86