From 32711d81ba916245d9aad35c6557a46c69eb2940 Mon Sep 17 00:00:00 2001
From: Peter Collins <pecolli@microsoft.com>
Date: Tue, 18 Oct 2022 16:44:36 -0400
Subject: [PATCH 1/2] [build] Add support for Visual Studio on win-arm64

---
 build-tools/automation/azure-pipelines.yaml   | 2 +-
 build-tools/create-packs/vs-workload.in.props | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index 7a1fbe38c16..f456253bf67 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -14,7 +14,7 @@ resources:
   - repository: yaml
     type: github
     name: xamarin/yaml-templates
-    ref: refs/heads/main
+    ref: refs/heads/nuget-msi-arm64
     endpoint: xamarin
   - repository: sdk-insertions
     type: github
diff --git a/build-tools/create-packs/vs-workload.in.props b/build-tools/create-packs/vs-workload.in.props
index 5e34ffd638e..86deb1275f1 100644
--- a/build-tools/create-packs/vs-workload.in.props
+++ b/build-tools/create-packs/vs-workload.in.props
@@ -13,7 +13,7 @@
       <Replacement>Android.Manifest</Replacement>
     </ShortNames>
     <ComponentResources Include="android" Version="@WORKLOAD_VERSION@" Category=".NET" Title=".NET SDK for Android" Description=".NET SDK Workload for building Android applications."/>
-    <WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.Android.Manifest*.nupkg" Version="@WORKLOAD_VERSION@" />
+    <WorkloadPackages Include="$(NuGetPackagePath)\Microsoft.NET.Sdk.Android.Manifest*.nupkg" Version="@WORKLOAD_VERSION@" SupportsMachineArch="true" />
     <MultiTargetPackNames Include="Microsoft.Android.Sdk" />
   </ItemGroup>
 </Project>

From 988d588a37e6b67f84862c2048290e34889c508b Mon Sep 17 00:00:00 2001
From: Peter Collins <pecolli@microsoft.com>
Date: Tue, 29 Nov 2022 13:58:48 -0500
Subject: [PATCH 2/2] Use yaml-templates@main

---
 build-tools/automation/azure-pipelines.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index 015caf82ea8..813eb4bd4be 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -14,7 +14,7 @@ resources:
   - repository: yaml-templates
     type: github
     name: xamarin/yaml-templates
-    ref: refs/heads/nuget-msi-arm64
+    ref: refs/heads/main
     endpoint: xamarin
   - repository: sdk-insertions
     type: github