From 2f4c7f4ac43fdc15d9415ed3a3429c5c874f297f Mon Sep 17 00:00:00 2001
From: Scott Jones <sjones@microsoft.com>
Date: Wed, 30 Aug 2023 14:34:52 -0700
Subject: [PATCH 1/2] Simply add auto initializer sources without a target, and
 define a user-available property to add WindowsAppSDK-VersionInfo.cs exactly
 once (#3819)

* Use CoreCompileDependsOn to ensure that version info is added before XamlPreCompile, not just CoreCompile

* restructured to enable apps to easily include WindowsAppSDK-VersionInfo.cs exactly once for all compilations (Xaml, etc)

* removed cruft target
---
 .../Microsoft.WindowsAppSDK.Bootstrap.CS.targets    | 13 +++++++------
 ...osoft.WindowsAppSDK.DeploymentManager.CS.targets | 13 +++++++------
 .../Microsoft.WindowsAppSDK.Foundation.targets      |  6 +++++-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/build/NuSpecs/Microsoft.WindowsAppSDK.Bootstrap.CS.targets b/build/NuSpecs/Microsoft.WindowsAppSDK.Bootstrap.CS.targets
index 07f0ccdd5c..1a7f16ab5e 100644
--- a/build/NuSpecs/Microsoft.WindowsAppSDK.Bootstrap.CS.targets
+++ b/build/NuSpecs/Microsoft.WindowsAppSDK.Bootstrap.CS.targets
@@ -8,13 +8,14 @@
         <DefineConstants Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_OnError_FailFast)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONERROR_FAILFAST</DefineConstants>
         <DefineConstants Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_OnNoMatch_ShowUI)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONNOMATCH_SHOWUI</DefineConstants>
         <DefineConstants Condition="'$(WindowsAppSDKBootstrapAutoInitializeOptions_OnPackageIdentity_NoOp)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_BOOTSTRAP_AUTO_INITIALIZE_OPTIONS_ONPACKAGEIDENTITY_NOOP</DefineConstants>
+        <WindowsAppSdkIncludeVersionInfo>true</WindowsAppSdkIncludeVersionInfo>
     </PropertyGroup>
 
-    <Target Name="GenerateBootstrapCS" BeforeTargets="BeforeCompile">
-        <ItemGroup>
-            <Compile Include="$(MSBuildThisFileDirectory)..\include\MddBootstrapAutoInitializer.cs" />
-            <Compile Include="$(MSBuildThisFileDirectory)..\include\WindowsAppSDK-VersionInfo.cs" />
-        </ItemGroup>
-    </Target>
+    <ItemGroup>
+        <Compile Include="$(MSBuildThisFileDirectory)..\include\MddBootstrapAutoInitializer.cs" />
+    </ItemGroup>
+
+    <!--Obsolete target retained to prevent build breaks-->
+    <Target Name="GenerateBootstrapCS" BeforeTargets="BeforeCompile" />
 
 </Project>
diff --git a/build/NuSpecs/Microsoft.WindowsAppSDK.DeploymentManager.CS.targets b/build/NuSpecs/Microsoft.WindowsAppSDK.DeploymentManager.CS.targets
index 4524c2766a..d4bda4c0b7 100644
--- a/build/NuSpecs/Microsoft.WindowsAppSDK.DeploymentManager.CS.targets
+++ b/build/NuSpecs/Microsoft.WindowsAppSDK.DeploymentManager.CS.targets
@@ -4,13 +4,14 @@
         <DefineConstants Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_Default)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_DEFAULT</DefineConstants>
         <DefineConstants Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_None)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_NONE</DefineConstants>
         <DefineConstants Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_OnErrorShowUI)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERRORSHOWUI</DefineConstants>
+        <WindowsAppSdkIncludeVersionInfo>true</WindowsAppSdkIncludeVersionInfo>
     </PropertyGroup>
 
-    <Target Name="GenerateDeploymentManagerCS" BeforeTargets="BeforeCompile">
-        <ItemGroup>
-            <Compile Include="$(MSBuildThisFileDirectory)..\include\DeploymentManagerAutoInitializer.cs" />
-            <Compile Include="$(MSBuildThisFileDirectory)..\include\WindowsAppSDK-VersionInfo.cs" />
-        </ItemGroup>
-    </Target>
+    <ItemGroup>
+        <Compile Include="$(MSBuildThisFileDirectory)..\include\DeploymentManagerAutoInitializer.cs" />
+    </ItemGroup>
+
+    <!--Obsolete target retained to prevent build breaks-->
+    <Target Name="GenerateDeploymentManagerCS" BeforeTargets="BeforeCompile" />
 
 </Project>
diff --git a/build/NuSpecs/Microsoft.WindowsAppSDK.Foundation.targets b/build/NuSpecs/Microsoft.WindowsAppSDK.Foundation.targets
index 11a6d03861..73434d043d 100644
--- a/build/NuSpecs/Microsoft.WindowsAppSDK.Foundation.targets
+++ b/build/NuSpecs/Microsoft.WindowsAppSDK.Foundation.targets
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
@@ -13,4 +13,8 @@
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.WindowsAppSDK.DeploymentManagerCommon.targets" />
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.WindowsAppSDK.DeploymentManager.CS.targets" Condition="'$(WindowsAppSdkDeploymentManagerInitialize)' == 'true'"/>
 
+  <ItemGroup>
+    <Compile Condition="'$(WindowsAppSdkIncludeVersionInfo)'=='true'" Include="$(MSBuildThisFileDirectory)..\include\WindowsAppSDK-VersionInfo.cs" />
+  </ItemGroup>
+
 </Project>

From ef5edec8b5f16b9e6e84f318ac31101709de6074 Mon Sep 17 00:00:00 2001
From: alexlamtest <68841560+alexlamtest@users.noreply.github.com>
Date: Thu, 17 Aug 2023 14:29:28 -0700
Subject: [PATCH 2/2] Update WindowsAppSDK-RunTestsInPipeline-Job.yml (#3798)

Stop running tests on 21h1 OS image because this version has reached end of support, and the image is no longer in the test VM pool.
---
 .../WindowsAppSDK-RunTestsInPipeline-Job.yml                 | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build/AzurePipelinesTemplates/WindowsAppSDK-RunTestsInPipeline-Job.yml b/build/AzurePipelinesTemplates/WindowsAppSDK-RunTestsInPipeline-Job.yml
index 1c846355f3..1adb59d903 100644
--- a/build/AzurePipelinesTemplates/WindowsAppSDK-RunTestsInPipeline-Job.yml
+++ b/build/AzurePipelinesTemplates/WindowsAppSDK-RunTestsInPipeline-Job.yml
@@ -53,11 +53,6 @@ jobs:
           buildPlatform: x64
           buildConfiguration: release
           testLocale: ja-JP
-        21H1_x64fre:
-          imageName: Windows.10.Enterprise.21h1
-          buildPlatform: x64
-          buildConfiguration: release
-          testLocale: en-US
         21H2_MS_x64fre:
           imageName: Windows.11.Enterprise.MultiSession.21h2
           buildPlatform: x64