From 1dd32717cc70cb2583416caab567b8f61932fe6c Mon Sep 17 00:00:00 2001
From: Peter Collins <pecolli@microsoft.com>
Date: Mon, 10 Jul 2023 15:38:01 -0400
Subject: [PATCH 1/2] [vs-workload] Set EnableSideBySideManifests=true

Context: https://github.com/xamarin/yaml-templates/pull/274
---
 build-tools/automation/azure-pipelines.yaml   | 2 +-
 build-tools/create-packs/vs-workload.in.props | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index 0ca96a500ec..be6af1ea12d 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/main
+    ref: refs/heads/dev/pjc/sxs-wl-versions
     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 ddb735bf0c7..0402cf82645 100644
--- a/build-tools/create-packs/vs-workload.in.props
+++ b/build-tools/create-packs/vs-workload.in.props
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetName>Microsoft.NET.Sdk.Android.Workload.@VSMAN_VERSION@</TargetName>
     <ManifestBuildVersion>@WORKLOAD_VERSION@</ManifestBuildVersion>
+    <EnableSideBySideManifests>true</EnableSideBySideManifests>
   </PropertyGroup>
   <ItemGroup>
     <!-- Shorten package names to avoid long path caching issues in Visual Studio -->

From f8bfd0e3cc833784b8154305b5bdfadd032bd9f6 Mon Sep 17 00:00:00 2001
From: Peter Collins <pecolli@microsoft.com>
Date: Wed, 12 Jul 2023 18:00:56 -0400
Subject: [PATCH 2/2] Revert test branch

---
 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 be6af1ea12d..0ca96a500ec 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/dev/pjc/sxs-wl-versions
+    ref: refs/heads/main
     endpoint: xamarin
   - repository: sdk-insertions
     type: github