From 31ab2c62706bd7e70155baf72e3799750fc552fd Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Wed, 5 Mar 2025 17:51:03 -0800
Subject: [PATCH 01/22] Update ProjectReunion-CI.yml

---
 build/ProjectReunion-CI.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/build/ProjectReunion-CI.yml b/build/ProjectReunion-CI.yml
index c3a60f9ebc..fa4e6bbd59 100644
--- a/build/ProjectReunion-CI.yml
+++ b/build/ProjectReunion-CI.yml
@@ -1,7 +1,15 @@
 # see https://docs.microsoft.com/azure/devops/pipelines/process/phases for info on yaml ADO jobs
 name: $(version)
 
+resources:
+  repositories:
+    - repository: WindowsAppSDKAggregator
+      type: git
+      name: ProjectReunion/WindowsAppSDKAggregator
+      ref: ${{ variables['Build.SourceBranch'] }}
+
 variables:
+- template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregator
 - template: WindowsAppSDK-Versions.yml
 - template: WindowsAppSDK-CommonVariables.yml
 - name: buildOutputDir

From cc55f6470ba9242de35f129b592fa4ce83efc21c Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Wed, 5 Mar 2025 17:52:05 -0800
Subject: [PATCH 02/22] Update ProjectReunion-BuildFoundation.yml

---
 build/ProjectReunion-BuildFoundation.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/ProjectReunion-BuildFoundation.yml b/build/ProjectReunion-BuildFoundation.yml
index 109cd28e51..394f8db456 100644
--- a/build/ProjectReunion-BuildFoundation.yml
+++ b/build/ProjectReunion-BuildFoundation.yml
@@ -11,11 +11,16 @@ resources:
       type: git
       name: ProjectReunion/WindowsAppSDKConfig
       ref: refs/heads/main
-
+    - repository: WindowsAppSDKAggregator
+      type: git
+      name: ProjectReunion/WindowsAppSDKAggregator
+      ref: ${{ variables['Build.SourceBranch'] }}
+      
 variables:
 - template: WindowsAppSDK-Versions.yml
 - template: WindowsAppSDK-CommonVariables.yml
 - template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
+- template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregator
 
 stages:
 - template: AzurePipelinesTemplates\WindowsAppSDK-BuildInstaller-Stage.yml@self

From 8a1b017d948c4a75b74c9226d7e2a0f343237137 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Wed, 5 Mar 2025 17:52:46 -0800
Subject: [PATCH 03/22] Update WindowsAppSDK-Foundation-Nightly.yml

---
 build/WindowsAppSDK-Foundation-Nightly.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/WindowsAppSDK-Foundation-Nightly.yml b/build/WindowsAppSDK-Foundation-Nightly.yml
index c0e84fc662..8e6f9f58f0 100644
--- a/build/WindowsAppSDK-Foundation-Nightly.yml
+++ b/build/WindowsAppSDK-Foundation-Nightly.yml
@@ -44,11 +44,16 @@ resources:
       type: git
       name: ProjectReunion/WindowsAppSDKConfig
       ref: refs/heads/main
-
+    - repository: WindowsAppSDKAggregator
+      type: git
+      name: ProjectReunion/WindowsAppSDKAggregator
+      ref: ${{ variables['Build.SourceBranch'] }}
+      
 variables:
 - template: WindowsAppSDK-Versions.yml
 - template: WindowsAppSDK-CommonVariables.yml
 - template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
+- template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregator
 
 extends:
   template: v2/Microsoft.NonOfficial.yml@templates # https://aka.ms/obpipelines/templates

From 50d1d9c644ffd527aecb9a9b08b866137b9f2956 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Wed, 5 Mar 2025 17:53:16 -0800
Subject: [PATCH 04/22] Update WindowsAppSDK-Foundation-Official.yml

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

diff --git a/build/WindowsAppSDK-Foundation-Official.yml b/build/WindowsAppSDK-Foundation-Official.yml
index 03a639fbb6..8c21548aae 100644
--- a/build/WindowsAppSDK-Foundation-Official.yml
+++ b/build/WindowsAppSDK-Foundation-Official.yml
@@ -44,11 +44,16 @@ resources:
       type: git
       name: ProjectReunion/WindowsAppSDKConfig
       ref: refs/heads/main
+    - repository: WindowsAppSDKAggregator
+      type: git
+      name: ProjectReunion/WindowsAppSDKAggregator
+      ref: ${{ variables['Build.SourceBranch'] }}
 
 variables:
 - template: WindowsAppSDK-Versions.yml
 - template: WindowsAppSDK-CommonVariables.yml
 - template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
+- template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregator
 
 extends:
   template: v2/Microsoft.Official.yml@templates # https://aka.ms/obpipelines/templates

From e5b32aa0e01817c036df6d77628b1211ed2e753b Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Wed, 5 Mar 2025 17:53:43 -0800
Subject: [PATCH 05/22] Update WindowsAppSDK-Foundation-PR.yml

---
 build/WindowsAppSDK-Foundation-PR.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build/WindowsAppSDK-Foundation-PR.yml b/build/WindowsAppSDK-Foundation-PR.yml
index 02b35292ac..7c663fb09c 100644
--- a/build/WindowsAppSDK-Foundation-PR.yml
+++ b/build/WindowsAppSDK-Foundation-PR.yml
@@ -35,11 +35,16 @@ resources:
       type: git
       name: ProjectReunion/WindowsAppSDKConfig
       ref: refs/heads/main
+    - repository: WindowsAppSDKAggregator
+      type: git
+      name: ProjectReunion/WindowsAppSDKAggregator
+      ref: ${{ variables['Build.SourceBranch'] }}
 
 variables:
 - template: WindowsAppSDK-Versions.yml
 - template: WindowsAppSDK-CommonVariables.yml
 - template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
+- template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregator
 
 extends:
   template: v2/Microsoft.NonOfficial.yml@templates # https://aka.ms/obpipelines/templates

From 8775fac5ed6183594275e91d2040c11734f49c20 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Wed, 5 Mar 2025 17:54:46 -0800
Subject: [PATCH 06/22] Update WindowsAppSDK-CommonVariables.yml

---
 build/WindowsAppSDK-CommonVariables.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/build/WindowsAppSDK-CommonVariables.yml b/build/WindowsAppSDK-CommonVariables.yml
index b637e11239..d81b710d7a 100644
--- a/build/WindowsAppSDK-CommonVariables.yml
+++ b/build/WindowsAppSDK-CommonVariables.yml
@@ -19,10 +19,14 @@ variables:
 
   # Native compiler version override for win undock. The two values below are for Ge, defined in:
   # https://dev.azure.com/microsoft/OS/_git/UndockedES?path=/Pipelines/Config/CompilerToolsSettings.json
-  compilerOverridePackageName: "DevDiv.rel.LKG18.VCTools"
-  compilerOverridePackageVersion: "19.42.3443710001+DevDivGIT.CI20250110.04-466784EE54DF2F302AD0CD6790031C954EF41DA23DA4415D73A76ADF260F2D21"
+  # Normally, the 3 variables below should remain null, so that we resort to using the corresponding global_compilerOverride* 
+  # values for compiling native code. Another legitimate scenario is to point all 3 variables below to a different LKG compiler
+  # version, say, for working around a problem with the LKG compiler pointed at by the corresponding global_compilerOverride* 
+  # values, for compiling native code.
+  compilerOverridePackageName: ""
+  compilerOverridePackageVersion: ""
   # Use the following corresponding version string instead of the above when calling nuget install directly.
-  compilerOverrideNupkgVersion: "19.42.34437100"
+  compilerOverrideNupkgVersion: ""
 
   # Docker image which is used to build the project https://aka.ms/obpipelines/containers
   WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2019/vse2022:latest'

From 534f516e67000764374eeee232bd29ee62d75510 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Wed, 5 Mar 2025 17:55:51 -0800
Subject: [PATCH 07/22] Update WindowsAppSDK-Build-Stage.yml

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

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml
index 0d8b0a7ffb..d42dedf88f 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml
@@ -66,6 +66,8 @@ stages:
         ob_sdl_apiscan_enabled: false
       ob_sdl_apiscan_softwareFolder: '$(build.SourcesDirectory)\APIScanTarget'
       ob_sdl_apiscan_symbolsFolder: '$(build.SourcesDirectory)\APIScanTarget;SRV*https://symweb.azurefd.net'
+      localCompilerOverridePackageName: $[coalesce(variables.compilerOverridePackageName, variables.global_CompilerOverridePackageName)]
+      localCompilerOverridePackageVersion: $[coalesce(variables.compilerOverridePackageVersion, variables.global_CompilerOverridePackageVersion)]      
     steps:
     - template: WindowsAppSDK-BuildFoundation-Steps.yml@self
       parameters:

From 2ace7bcf84915cfd824ae1fd513a9473e2c2449b Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Wed, 5 Mar 2025 17:56:30 -0800
Subject: [PATCH 08/22] Update WindowsAppSDK-BuildInstaller-Stage.yml

---
 .../WindowsAppSDK-BuildInstaller-Stage.yml                      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml
index 18aa9bfe85..5791972b0b 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml
@@ -29,6 +29,8 @@ stages:
       # foundationRepoPath should be empty because we are not doing multiple checkouts hence
       # it is not under $(Build.SourcesDirectory)\WindowsAppSDK
       foundationRepoPath: ""
+      localCompilerOverridePackageName: $[coalesce(variables.compilerOverridePackageName, variables.global_CompilerOverridePackageName)]
+      localCompilerOverridePackageVersion: $[coalesce(variables.compilerOverridePackageVersion, variables.global_CompilerOverridePackageVersion)]
     condition: ne(variables.LatestOfficialBuildID, '')
     steps:
     - template: WindowsAppSDK-BuildInstaller-Steps.yml@self

From b583c83db1ebd3dc08bf70deef416775a19e80e0 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:18:05 -0700
Subject: [PATCH 09/22] Update ProjectReunion-BuildFoundation.yml

---
 build/ProjectReunion-BuildFoundation.yml | 29 +++++++++++++++++++-----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/build/ProjectReunion-BuildFoundation.yml b/build/ProjectReunion-BuildFoundation.yml
index 394f8db456..da67a902dd 100644
--- a/build/ProjectReunion-BuildFoundation.yml
+++ b/build/ProjectReunion-BuildFoundation.yml
@@ -5,6 +5,19 @@ name: $(version)
 
 trigger: none
 
+variables:
+- template: WindowsAppSDK-Versions.yml
+- template: WindowsAppSDK-CommonVariables.yml
+- template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
+# If we pass ${{ variables['Build.SourceBranch'] }} directly to ref: below, then in a PR validation pipeline run scenario,
+# there will be an error parsing the resources->repositories->repository->WindowsAppSDKAggregatorSourceBranch because 
+# the branch Build.SourceBranch does not exist on the Agg repo. Avoid hitting that error by redirecting to the Main branch.
+- name: mySourceBranch
+  ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+    value: refs/heads/main
+  ${{ else }}:
+    value: ${{ variables['Build.SourceBranch'] }}
+
 resources:
   repositories:
     - repository: WindowsAppSDKConfig
@@ -15,12 +28,16 @@ resources:
       type: git
       name: ProjectReunion/WindowsAppSDKAggregator
       ref: ${{ variables['Build.SourceBranch'] }}
-      
-variables:
-- template: WindowsAppSDK-Versions.yml
-- template: WindowsAppSDK-CommonVariables.yml
-- template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
-- template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregator
+    # Depending on the settings of this pipeline run, we will use exactly one of the following two definitions for the Agg repo.
+    # Either we reference the Main branch, or the same branch as the branch that this pipeline is currently being run against.
+    - repository: WindowsAppSDKAggregatorSourceBranch
+      type: git
+      name: ProjectReunion/WindowsAppSDKAggregator
+      ref: ${{ variables['mySourceBranch'] }}
+    - repository: WindowsAppSDKAggregatorMainBranch
+      type: git
+      name: ProjectReunion/WindowsAppSDKAggregator
+      ref: refs/heads/main
 
 stages:
 - template: AzurePipelinesTemplates\WindowsAppSDK-BuildInstaller-Stage.yml@self

From c5e412c14b34e1dc7c2d4b2f9a94a6ab502d56a7 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:19:44 -0700
Subject: [PATCH 10/22] Update ProjectReunion-CI.yml

---
 build/ProjectReunion-CI.yml | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/build/ProjectReunion-CI.yml b/build/ProjectReunion-CI.yml
index fa4e6bbd59..f0f0433437 100644
--- a/build/ProjectReunion-CI.yml
+++ b/build/ProjectReunion-CI.yml
@@ -1,19 +1,32 @@
 # see https://docs.microsoft.com/azure/devops/pipelines/process/phases for info on yaml ADO jobs
 name: $(version)
 
-resources:
-  repositories:
-    - repository: WindowsAppSDKAggregator
-      type: git
-      name: ProjectReunion/WindowsAppSDKAggregator
-      ref: ${{ variables['Build.SourceBranch'] }}
-
 variables:
-- template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregator
 - template: WindowsAppSDK-Versions.yml
 - template: WindowsAppSDK-CommonVariables.yml
 - name: buildOutputDir
   value: $(Build.SourcesDirectory)\BuildOutput
+# If we pass ${{ variables['Build.SourceBranch'] }} directly to ref: below, then in a PR validation pipeline run scenario,
+# there will be an error parsing the resources->repositories->repository->WindowsAppSDKAggregatorSourceBranch because 
+# the branch Build.SourceBranch does not exist on the Agg repo. Avoid hitting that error by redirecting to the Main branch.
+- name: mySourceBranch
+  ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+    value: refs/heads/main
+  ${{ else }}:
+    value: ${{ variables['Build.SourceBranch'] }}
+
+resources:
+  repositories:
+    # Depending on the settings of this pipeline run, we will use exactly one of the following two definitions for the Agg repo.
+    # Either we reference the Main branch, or the same branch as the branch that this pipeline is currently being run against.
+    - repository: WindowsAppSDKAggregatorSourceBranch
+      type: git
+      name: ProjectReunion/WindowsAppSDKAggregator
+      ref: ${{ variables['mySourceBranch'] }}
+    - repository: WindowsAppSDKAggregatorMainBranch
+      type: git
+      name: ProjectReunion/WindowsAppSDKAggregator
+      ref: refs/heads/main
 
 jobs:
 - job: PreChecks

From 2008fae14356f5a5c39dfe6ba0b4d3ec06a778f5 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:20:14 -0700
Subject: [PATCH 11/22] Update ProjectReunion-BuildFoundation.yml

---
 build/ProjectReunion-BuildFoundation.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build/ProjectReunion-BuildFoundation.yml b/build/ProjectReunion-BuildFoundation.yml
index da67a902dd..092fbb6fe6 100644
--- a/build/ProjectReunion-BuildFoundation.yml
+++ b/build/ProjectReunion-BuildFoundation.yml
@@ -24,10 +24,6 @@ resources:
       type: git
       name: ProjectReunion/WindowsAppSDKConfig
       ref: refs/heads/main
-    - repository: WindowsAppSDKAggregator
-      type: git
-      name: ProjectReunion/WindowsAppSDKAggregator
-      ref: ${{ variables['Build.SourceBranch'] }}
     # Depending on the settings of this pipeline run, we will use exactly one of the following two definitions for the Agg repo.
     # Either we reference the Main branch, or the same branch as the branch that this pipeline is currently being run against.
     - repository: WindowsAppSDKAggregatorSourceBranch

From ff5ad54c2000b105c40971ea89e1521e5ab263f9 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:21:27 -0700
Subject: [PATCH 12/22] Update WindowsAppSDK-Foundation-Nightly.yml

---
 build/WindowsAppSDK-Foundation-Nightly.yml | 29 ++++++++++++++++------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/build/WindowsAppSDK-Foundation-Nightly.yml b/build/WindowsAppSDK-Foundation-Nightly.yml
index 8e6f9f58f0..4d1cd46a32 100644
--- a/build/WindowsAppSDK-Foundation-Nightly.yml
+++ b/build/WindowsAppSDK-Foundation-Nightly.yml
@@ -34,6 +34,19 @@ parameters:
   type: boolean
   default: true
 
+variables:
+- template: WindowsAppSDK-Versions.yml
+- template: WindowsAppSDK-CommonVariables.yml
+- template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
+# If we pass ${{ variables['Build.SourceBranch'] }} directly to ref: below, then in a PR validation pipeline run scenario,
+# there will be an error parsing the resources->repositories->repository->WindowsAppSDKAggregatorSourceBranch because 
+# the branch Build.SourceBranch does not exist on the Agg repo. Avoid hitting that error by redirecting to the Main branch.
+- name: mySourceBranch
+  ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+    value: refs/heads/main
+  ${{ else }}:
+    value: ${{ variables['Build.SourceBranch'] }}
+
 resources:
   repositories:
     - repository: templates
@@ -44,16 +57,16 @@ resources:
       type: git
       name: ProjectReunion/WindowsAppSDKConfig
       ref: refs/heads/main
-    - repository: WindowsAppSDKAggregator
+    # Depending on the settings of this pipeline run, we will use exactly one of the following two definitions for the Agg repo.
+    # Either we reference the Main branch, or the same branch as the branch that this pipeline is currently being run against.
+    - repository: WindowsAppSDKAggregatorSourceBranch
       type: git
       name: ProjectReunion/WindowsAppSDKAggregator
-      ref: ${{ variables['Build.SourceBranch'] }}
-      
-variables:
-- template: WindowsAppSDK-Versions.yml
-- template: WindowsAppSDK-CommonVariables.yml
-- template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
-- template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregator
+      ref: ${{ variables['mySourceBranch'] }}
+    - repository: WindowsAppSDKAggregatorMainBranch
+      type: git
+      name: ProjectReunion/WindowsAppSDKAggregator
+      ref: refs/heads/main
 
 extends:
   template: v2/Microsoft.NonOfficial.yml@templates # https://aka.ms/obpipelines/templates

From ab24a1ed6d3fb3a84ee3e37ff0c7fe868196f1fb Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:22:05 -0700
Subject: [PATCH 13/22] Update WindowsAppSDK-Foundation-Official.yml

---
 build/WindowsAppSDK-Foundation-Official.yml | 29 +++++++++++++++------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/build/WindowsAppSDK-Foundation-Official.yml b/build/WindowsAppSDK-Foundation-Official.yml
index 8c21548aae..bb4cc59168 100644
--- a/build/WindowsAppSDK-Foundation-Official.yml
+++ b/build/WindowsAppSDK-Foundation-Official.yml
@@ -34,6 +34,19 @@ parameters:
   type: boolean
   default: true
 
+variables:
+- template: WindowsAppSDK-Versions.yml
+- template: WindowsAppSDK-CommonVariables.yml
+- template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
+# If we pass ${{ variables['Build.SourceBranch'] }} directly to ref: below, then in a PR validation pipeline run scenario,
+# there will be an error parsing the resources->repositories->repository->WindowsAppSDKAggregatorSourceBranch because 
+# the branch Build.SourceBranch does not exist on the Agg repo. Avoid hitting that error by redirecting to the Main branch.
+- name: mySourceBranch
+  ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+    value: refs/heads/main
+  ${{ else }}:
+    value: ${{ variables['Build.SourceBranch'] }}
+
 resources:
   repositories:
     - repository: templates
@@ -44,16 +57,16 @@ resources:
       type: git
       name: ProjectReunion/WindowsAppSDKConfig
       ref: refs/heads/main
-    - repository: WindowsAppSDKAggregator
+    # Depending on the settings of this pipeline run, we will use exactly one of the following two definitions for the Agg repo.
+    # Either we reference the Main branch, or the same branch as the branch that this pipeline is currently being run against.
+    - repository: WindowsAppSDKAggregatorSourceBranch
       type: git
       name: ProjectReunion/WindowsAppSDKAggregator
-      ref: ${{ variables['Build.SourceBranch'] }}
-
-variables:
-- template: WindowsAppSDK-Versions.yml
-- template: WindowsAppSDK-CommonVariables.yml
-- template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
-- template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregator
+      ref: ${{ variables['mySourceBranch'] }}
+    - repository: WindowsAppSDKAggregatorMainBranch
+      type: git
+      name: ProjectReunion/WindowsAppSDKAggregator
+      ref: refs/heads/main
 
 extends:
   template: v2/Microsoft.Official.yml@templates # https://aka.ms/obpipelines/templates

From 3e436d2ad44245f0b69a3c363aa80954c72c43e6 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:22:59 -0700
Subject: [PATCH 14/22] Update WindowsAppSDK-Foundation-PR.yml

---
 build/WindowsAppSDK-Foundation-PR.yml | 29 +++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/build/WindowsAppSDK-Foundation-PR.yml b/build/WindowsAppSDK-Foundation-PR.yml
index 7c663fb09c..7247cb1ec8 100644
--- a/build/WindowsAppSDK-Foundation-PR.yml
+++ b/build/WindowsAppSDK-Foundation-PR.yml
@@ -25,6 +25,19 @@ parameters: # parameters are shown up in ADO UI in a build queue time
   type: boolean
   default: true
 
+variables:
+- template: WindowsAppSDK-Versions.yml
+- template: WindowsAppSDK-CommonVariables.yml
+- template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
+# If we pass ${{ variables['Build.SourceBranch'] }} directly to ref: below, then in a PR validation pipeline run scenario,
+# there will be an error parsing the resources->repositories->repository->WindowsAppSDKAggregatorSourceBranch because 
+# the branch Build.SourceBranch does not exist on the Agg repo. Avoid hitting that error by redirecting to the Main branch.
+- name: mySourceBranch
+  ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+    value: refs/heads/main
+  ${{ else }}:
+    value: ${{ variables['Build.SourceBranch'] }}
+
 resources:
   repositories:
     - repository: templates
@@ -35,16 +48,16 @@ resources:
       type: git
       name: ProjectReunion/WindowsAppSDKConfig
       ref: refs/heads/main
-    - repository: WindowsAppSDKAggregator
+    # Depending on the settings of this pipeline run, we will use exactly one of the following two definitions for the Agg repo.
+    # Either we reference the Main branch, or the same branch as the branch that this pipeline is currently being run against.
+    - repository: WindowsAppSDKAggregatorSourceBranch
       type: git
       name: ProjectReunion/WindowsAppSDKAggregator
-      ref: ${{ variables['Build.SourceBranch'] }}
-
-variables:
-- template: WindowsAppSDK-Versions.yml
-- template: WindowsAppSDK-CommonVariables.yml
-- template: WindowsAppSDK-Foundation-TestConfig.yml@WindowsAppSDKConfig
-- template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregator
+      ref: ${{ variables['mySourceBranch'] }}
+    - repository: WindowsAppSDKAggregatorMainBranch
+      type: git
+      name: ProjectReunion/WindowsAppSDKAggregator
+      ref: refs/heads/main
 
 extends:
   template: v2/Microsoft.NonOfficial.yml@templates # https://aka.ms/obpipelines/templates

From 262abdd3cd8bc926f002f35038d74c7699f210cd Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:28:15 -0700
Subject: [PATCH 15/22] Update WindowsAppSDK-Build-Stage.yml

---
 .../WindowsAppSDK-Build-Stage.yml             | 113 ++++++++++++++----
 1 file changed, 92 insertions(+), 21 deletions(-)

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml
index d42dedf88f..399c1f76a3 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml
@@ -57,18 +57,52 @@ stages:
           buildConfiguration: 'release'
           normalizedConfiguration: 'fre'
     variables:
-      ob_outputDirectory: '$(REPOROOT)\out'
-      ob_sdl_codeSignValidation_excludes: '-|**\Release\**;-|**\packages\**'
-      ob_artifactBaseName: "FoundationBinaries_$(buildConfiguration)_$(buildPlatform)"
-      ${{ if parameters.runStaticAnalysis }}:
-        ob_sdl_apiscan_enabled: true
-      ${{ if not( parameters.runStaticAnalysis ) }}:
-        ob_sdl_apiscan_enabled: false
-      ob_sdl_apiscan_softwareFolder: '$(build.SourcesDirectory)\APIScanTarget'
-      ob_sdl_apiscan_symbolsFolder: '$(build.SourcesDirectory)\APIScanTarget;SRV*https://symweb.azurefd.net'
-      localCompilerOverridePackageName: $[coalesce(variables.compilerOverridePackageName, variables.global_CompilerOverridePackageName)]
-      localCompilerOverridePackageVersion: $[coalesce(variables.compilerOverridePackageVersion, variables.global_CompilerOverridePackageVersion)]      
+      - name: ob_outputDirectory
+        value: '$(REPOROOT)\out'
+      - name: ob_sdl_codeSignValidation_excludes
+        value: '-|**\Release\**;-|**\packages\**'
+      - name: ob_artifactBaseName
+        value: "FoundationBinaries_$(buildConfiguration)_$(buildPlatform)"
+      - name: ob_sdl_apiscan_enabled
+        ${{ if parameters.runStaticAnalysis }}:
+          value: true
+        ${{ else }}:
+          value: false
+      - name: ob_sdl_apiscan_softwareFolder
+        value: '$(build.SourcesDirectory)\APIScanTarget'
+      - name: ob_sdl_apiscan_symbolsFolder
+        value: '$(build.SourcesDirectory)\APIScanTarget;SRV*https://symweb.azurefd.net'
+      - ${{ if contains(variables['Build.SourceBranch'], 'user') }}:
+        # If this pipeline run is targetting a developer's private branch, most of the time there is no
+        # corresponding private branch on the Agg repo. Therefore, by default, map to the Main branch on
+        # the Agg repo to avoid a "file not found" error. 
+        # In the uncommon case that the developer means to target the corresponding private branch on the
+        # Agg repo, change WindowsAppSDKAggregatorMainBranch to WindowsAppSDKAggregatorSourceBranch below.
+        - template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregatorMainBranch
+      - ${{ elseif and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release'), not(or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.0'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.1'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.2'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.3'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.4'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.5'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.6'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.7')))) }}:    
+        # If this pipeline run is targetting a servicing branch which is new enough (1.8+), then we expect
+        # the file WindowsAppSDK-Global-LKGVersions.yml to exists on the Agg repo in the corresponding 
+        # branch, so target the corresponding branch on the Agg repo.
+        - template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregatorSourceBranch
+      - ${{ else }}:
+        # If this pipeline run is targetting the Main branch, a Pull Request branch (e.g., refs/pull/12460423/merge),
+        # or some other unexpected branch, target the Main branch on the Agg repo by default.
+        - template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregatorMainBranch
+      - name: localCompilerOverridePackageName
+        value: $[coalesce(variables.compilerOverridePackageName, variables.global_CompilerOverridePackageName)]
+      - name: localCompilerOverridePackageVersion
+        value: $[coalesce(variables.compilerOverridePackageVersion, variables.global_CompilerOverridePackageVersion)]
     steps:
+    # In case we picked the wrong branch for the Agg repo in the variables section above, this helps diagnose that problem.
+    - script: |
+        echo Build.SourceBranch=$(Build.SourceBranch)
+        echo compilerOverridePackageName=$(compilerOverridePackageName)
+        echo compilerOverridePackageVersion=$(compilerOverridePackageVersion)
+        echo global_CompilerOverridePackageName=$(global_CompilerOverridePackageName)
+        echo global_CompilerOverridePackageVersion=$(global_CompilerOverridePackageVersion)
+        echo localCompilerOverridePackageName=$(localCompilerOverridePackageName)
+        echo localCompilerOverridePackageVersion=$(localCompilerOverridePackageVersion)
+
     - template: WindowsAppSDK-BuildFoundation-Steps.yml@self
       parameters:
         SignOutput: ${{ parameters.SignOutput }}
@@ -130,17 +164,54 @@ stages:
           buildConfiguration: 'Release'
           normalizedConfiguration: 'fre'
     variables:
-      ob_outputDirectory: '$(REPOROOT)\out'
-      ob_sdl_codeSignValidation_excludes: '-|**\Release\**'
-      ob_sdl_suppression_suppressionSet: default
-      ob_artifactBaseName: "MrtBinaries_$(buildConfiguration)_$(buildPlatform)"
-      ${{ if parameters.runStaticAnalysis }}:
-        ob_sdl_apiscan_enabled: true
-      ${{ if not( parameters.runStaticAnalysis ) }}:
-        ob_sdl_apiscan_enabled: false
-      ob_sdl_apiscan_softwareFolder: '$(build.SourcesDirectory)\APIScanTarget'
-      ob_sdl_apiscan_symbolsFolder: '$(build.SourcesDirectory)\APIScanTarget;SRV*https://symweb.azurefd.net'
+      - name: ob_outputDirectory
+        value: '$(REPOROOT)\out'
+      - name: ob_sdl_codeSignValidation_excludes
+        value: '-|**\Release\**'
+      - name: ob_sdl_suppression_suppressionSet
+        value: default
+      - name: ob_artifactBaseName
+        value: "MrtBinaries_$(buildConfiguration)_$(buildPlatform)"
+      - name: ob_sdl_apiscan_enabled
+        ${{ if parameters.runStaticAnalysis }}
+          value: true
+        ${{ else }}:
+          value: false
+      - name: ob_sdl_apiscan_softwareFolder
+        value: '$(build.SourcesDirectory)\APIScanTarget'
+      - name: ob_sdl_apiscan_symbolsFolder
+        value: '$(build.SourcesDirectory)\APIScanTarget;SRV*https://symweb.azurefd.net'
+      - ${{ if contains(variables['Build.SourceBranch'], 'user') }}:
+        # If this pipeline run is targetting a developer's private branch, most of the time there is no
+        # corresponding private branch on the Agg repo. Therefore, by default, map to the Main branch on
+        # the Agg repo to avoid a "file not found" error. 
+        # In the uncommon case that the developer means to target the corresponding private branch on the
+        # Agg repo, change WindowsAppSDKAggregatorMainBranch to WindowsAppSDKAggregatorSourceBranch below.
+        - template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregatorMainBranch
+      - ${{ elseif and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release'), not(or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.0'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.1'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.2'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.3'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.4'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.5'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.6'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.7')))) }}:    
+        # If this pipeline run is targetting a servicing branch which is new enough (1.8+), then we expect
+        # the file WindowsAppSDK-Global-LKGVersions.yml to exists on the Agg repo in the corresponding 
+        # branch, so target the corresponding branch on the Agg repo.
+        - template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregatorSourceBranch
+      - ${{ else }}:
+        # If this pipeline run is targetting the Main branch, a Pull Request branch (e.g., refs/pull/12460423/merge),
+        # or some other unexpected branch, target the Main branch on the Agg repo by default.
+        - template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregatorMainBranch
+      - name: localCompilerOverridePackageName
+        value: $[coalesce(variables.compilerOverridePackageName, variables.global_CompilerOverridePackageName)]
+      - name: localCompilerOverridePackageVersion
+        value: $[coalesce(variables.compilerOverridePackageVersion, variables.global_CompilerOverridePackageVersion)]
     steps:
+    # In case we picked the wrong branch for the Agg repo in the variables section above, this helps diagnose that problem.
+    - script: |
+        echo Build.SourceBranch=$(Build.SourceBranch)
+        echo compilerOverridePackageName=$(compilerOverridePackageName)
+        echo compilerOverridePackageVersion=$(compilerOverridePackageVersion)
+        echo global_CompilerOverridePackageName=$(global_CompilerOverridePackageName)
+        echo global_CompilerOverridePackageVersion=$(global_CompilerOverridePackageVersion)
+        echo localCompilerOverridePackageName=$(localCompilerOverridePackageName)
+        echo localCompilerOverridePackageVersion=$(localCompilerOverridePackageVersion)
+        
     - template: WindowsAppSDK-BuildMRT-Steps.yml@self
       parameters:
         SignOutput: ${{ parameters.SignOutput }}

From 2c24ea41e8080e177ea332e23a7859d304c38e36 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:29:09 -0700
Subject: [PATCH 16/22] Update WindowsAppSDK-BuildFoundation-Steps.yml

---
 .../WindowsAppSDK-BuildFoundation-Steps.yml                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml
index db2cbecc5b..cb31691735 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildFoundation-Steps.yml
@@ -58,8 +58,8 @@ steps:
   displayName: 'Setup native compiler version override'
   inputs:
     microsoftDropReadPat: $(System.AccessToken)
-    compilerPackageName: $(compilerOverridePackageName)
-    compilerPackageVersion: $(compilerOverridePackageVersion)
+    compilerPackageName: $(localCompilerOverridePackageName)
+    compilerPackageVersion: $(localCompilerOverridePackageVersion)
     slnDirectory: $(Build.SourcesDirectory)
     includeUCRT: true
     ucrtFeedPat: $(System.AccessToken)

From 94bcad22caed1c7a055617be8e46bbeb3e5b1679 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:30:29 -0700
Subject: [PATCH 17/22] Update WindowsAppSDK-BuildInstaller-Stage.yml

---
 .../WindowsAppSDK-BuildInstaller-Stage.yml    | 44 ++++++++++++++++---
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml
index 5791972b0b..628accdf96 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml
@@ -23,14 +23,46 @@ stages:
           buildPlatform: 'arm64'
           buildConfiguration: 'Release'
     variables:
-      ob_outputDirectory: '$(REPOROOT)\out'
-      ob_artifactSuffix: '_$(buildConfiguration)_$(buildPlatform)'
-      ob_artifactBaseName: "Installer$(ob_artifactSuffix)"
+      - name: ob_outputDirectory
+        value: '$(REPOROOT)\out'
+      - name: ob_artifactSuffix
+        value: '_$(buildConfiguration)_$(buildPlatform)'
+      - name: ob_artifactBaseName
+        value: "Installer$(ob_artifactSuffix)"
       # foundationRepoPath should be empty because we are not doing multiple checkouts hence
       # it is not under $(Build.SourcesDirectory)\WindowsAppSDK
-      foundationRepoPath: ""
-      localCompilerOverridePackageName: $[coalesce(variables.compilerOverridePackageName, variables.global_CompilerOverridePackageName)]
-      localCompilerOverridePackageVersion: $[coalesce(variables.compilerOverridePackageVersion, variables.global_CompilerOverridePackageVersion)]
+      - name: foundationRepoPath
+        value: ""
+      - ${{ if contains(variables['Build.SourceBranch'], 'user') }}:
+        # If this pipeline run is targetting a developer's private branch, most of the time there is no
+        # corresponding private branch on the Agg repo. Therefore, by default, map to the Main branch on
+        # the Agg repo to avoid a "file not found" error. 
+        # In the uncommon case that the developer means to target the corresponding private branch on the
+        # Agg repo, change WindowsAppSDKAggregatorMainBranch to WindowsAppSDKAggregatorSourceBranch below.
+        - template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregatorMainBranch
+      - ${{ elseif and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release'), not(or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.0'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.1'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.2'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.3'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.4'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.5'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.6'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.7')))) }}:    
+        # If this pipeline run is targetting a servicing branch which is new enough (1.8+), then we expect
+        # the file WindowsAppSDK-Global-LKGVersions.yml to exists on the Agg repo in the corresponding 
+        # branch, so target the corresponding branch on the Agg repo.
+        - template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregatorSourceBranch
+      - ${{ else }}:
+        # If this pipeline run is targetting the Main branch, a Pull Request branch (e.g., refs/pull/12460423/merge),
+        # or some other unexpected branch, target the Main branch on the Agg repo by default.
+        - template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregatorMainBranch
+      - name: localCompilerOverridePackageName
+        value: $[coalesce(variables.compilerOverridePackageName, variables.global_CompilerOverridePackageName)]
+      - name: localCompilerOverridePackageVersion
+        value: $[coalesce(variables.compilerOverridePackageVersion, variables.global_CompilerOverridePackageVersion)]
     condition: ne(variables.LatestOfficialBuildID, '')
     steps:
+    # In case we picked the wrong branch for the Agg repo in the variables section above, this helps diagnose that problem.
+    - script: |
+        echo Build.SourceBranch=$(Build.SourceBranch)
+        echo compilerOverridePackageName=$(compilerOverridePackageName)
+        echo compilerOverridePackageVersion=$(compilerOverridePackageVersion)
+        echo global_CompilerOverridePackageName=$(global_CompilerOverridePackageName)
+        echo global_CompilerOverridePackageVersion=$(global_CompilerOverridePackageVersion)
+        echo localCompilerOverridePackageName=$(localCompilerOverridePackageName)
+        echo localCompilerOverridePackageVersion=$(localCompilerOverridePackageVersion)
+
     - template: WindowsAppSDK-BuildInstaller-Steps.yml@self

From d642dba1f4eac0be75166fffb26b36be229b44e8 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:31:08 -0700
Subject: [PATCH 18/22] Update WindowsAppSDK-BuildInstaller-Steps.yml

---
 .../WindowsAppSDK-BuildInstaller-Steps.yml                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Steps.yml
index 8402b53796..2439dc443b 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Steps.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Steps.yml
@@ -199,8 +199,8 @@ steps:
   displayName: 'Setup native compiler version override'
   inputs:
     microsoftDropReadPat: $(System.AccessToken)
-    compilerPackageName: $(compilerOverridePackageName)
-    compilerPackageVersion: $(compilerOverridePackageVersion)
+    compilerPackageName: $(localCompilerOverridePackageName)
+    compilerPackageVersion: $(localCompilerOverridePackageVersion)
     slnDirectory: $(Build.SourcesDirectory)\$(foundationRepoPath)installer\dev
     includeUCRT: true
     ucrtFeedPat: $(System.AccessToken)

From b2dae7f016ad261e86314a1428e6dedcc6e4ad47 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:31:30 -0700
Subject: [PATCH 19/22] Update WindowsAppSDK-BuildMRT-Steps.yml

---
 .../AzurePipelinesTemplates/WindowsAppSDK-BuildMRT-Steps.yml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildMRT-Steps.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildMRT-Steps.yml
index cfff8928ce..ee6e6cb978 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildMRT-Steps.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildMRT-Steps.yml
@@ -18,8 +18,8 @@ steps:
   displayName: 'Setup native compiler version override'
   inputs:
     microsoftDropReadPat: $(System.AccessToken)
-    compilerPackageName: $(compilerOverridePackageName)
-    compilerPackageVersion: $(compilerOverridePackageVersion)
+    compilerPackageName: $(localCompilerOverridePackageName)
+    compilerPackageVersion: $(localCompilerOverridePackageVersion)
     slnDirectory: $(Build.SourcesDirectory)\dev\MRTCore\mrt
     includeUCRT: true
     ucrtFeedPat: $(System.AccessToken)

From 772c67b9b54895d7caa41531c99c14a020a5380e Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 13 Mar 2025 16:35:59 -0700
Subject: [PATCH 20/22] Update WindowsAppSDK-Build-Stage.yml

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

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml
index 399c1f76a3..a15161e87d 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml
@@ -173,7 +173,7 @@ stages:
       - name: ob_artifactBaseName
         value: "MrtBinaries_$(buildConfiguration)_$(buildPlatform)"
       - name: ob_sdl_apiscan_enabled
-        ${{ if parameters.runStaticAnalysis }}
+        ${{ if parameters.runStaticAnalysis }}:
           value: true
         ${{ else }}:
           value: false

From aef2160c8f80aa3da256b36a13b87f78e649938f Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 13 Mar 2025 18:30:10 -0700
Subject: [PATCH 21/22] Update WindowsAppSDK-Build-Stage.yml

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

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml
index a15161e87d..20d5f91568 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-Build-Stage.yml
@@ -79,7 +79,7 @@ stages:
         # In the uncommon case that the developer means to target the corresponding private branch on the
         # Agg repo, change WindowsAppSDKAggregatorMainBranch to WindowsAppSDKAggregatorSourceBranch below.
         - template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregatorMainBranch
-      - ${{ elseif and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release'), not(or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.0'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.1'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.2'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.3'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.4'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.5'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.6'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.7')))) }}:    
+      - ${{ elseif and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release'), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.7'))) }}:    
         # If this pipeline run is targetting a servicing branch which is new enough (1.8+), then we expect
         # the file WindowsAppSDK-Global-LKGVersions.yml to exists on the Agg repo in the corresponding 
         # branch, so target the corresponding branch on the Agg repo.

From 0ce74affff1c5d9804aade4431b80581400bdf8e Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 13 Mar 2025 18:31:53 -0700
Subject: [PATCH 22/22] Update WindowsAppSDK-BuildInstaller-Stage.yml

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

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml
index 628accdf96..163c1b6278 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-BuildInstaller-Stage.yml
@@ -40,7 +40,7 @@ stages:
         # In the uncommon case that the developer means to target the corresponding private branch on the
         # Agg repo, change WindowsAppSDKAggregatorMainBranch to WindowsAppSDKAggregatorSourceBranch below.
         - template: build/AzurePipelinesTemplates/WindowsAppSDK-Global-LKGVersions.yml@WindowsAppSDKAggregatorMainBranch
-      - ${{ elseif and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release'), not(or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.0'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.1'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.2'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.3'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.4'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.5'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.6'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.7')))) }}:    
+      - ${{ elseif and(startsWith(variables['Build.SourceBranch'], 'refs/heads/release'), not(startsWith(variables['Build.SourceBranch'], 'refs/heads/release-1.7'))) }}:    
         # If this pipeline run is targetting a servicing branch which is new enough (1.8+), then we expect
         # the file WindowsAppSDK-Global-LKGVersions.yml to exists on the Agg repo in the corresponding 
         # branch, so target the corresponding branch on the Agg repo.