From 4c69c5cf5d7cf2d9a5c4f7b086609f4b20f210b9 Mon Sep 17 00:00:00 2001
From: Sarah Oslund <sfoslund@microsoft.com>
Date: Thu, 22 Apr 2021 14:36:56 -0700
Subject: [PATCH 1/2] Update manifest installer authoring to allow for data dir

---
 eng/Versions.props                          | 10 +++++-----
 src/redist/targets/BundledManifests.targets |  7 ++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 494daac50..5f364053e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -146,11 +146,11 @@
   </PropertyGroup>
   <!-- Workload manifest package versions -->
   <PropertyGroup>
-    <XamarinAndroidWorkloadManifestVersion>11.0.200-preview.3.196</XamarinAndroidWorkloadManifestVersion>
-    <XamarinIOSWorkloadManifestVersion>14.4.100-preview.3.1326</XamarinIOSWorkloadManifestVersion>
-    <XamarinMacCatalystWorkloadManifestVersion>14.3.100-preview.3.471</XamarinMacCatalystWorkloadManifestVersion>
-    <XamarinMacOSWorkloadManifestVersion>11.1.100-preview.3.1379</XamarinMacOSWorkloadManifestVersion>
-    <XamarinTvOSWorkloadManifestVersion>14.3.100-preview.3.1379</XamarinTvOSWorkloadManifestVersion>
+    <XamarinAndroidWorkloadManifestVersion>11.0.200-ci.main.226</XamarinAndroidWorkloadManifestVersion>
+    <XamarinIOSWorkloadManifestVersion>14.5.100-ci.main.618</XamarinIOSWorkloadManifestVersion>
+    <XamarinMacCatalystWorkloadManifestVersion>14.5.100-ci.main.618</XamarinMacCatalystWorkloadManifestVersion>
+    <XamarinMacOSWorkloadManifestVersion>11.3.100-ci.main.618</XamarinMacOSWorkloadManifestVersion>
+    <XamarinTvOSWorkloadManifestVersion>14.5.100-ci.main.618</XamarinTvOSWorkloadManifestVersion>
     <BlazorWorkloadManifestVersion>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</BlazorWorkloadManifestVersion>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets
index e7024c333..c7037bf83 100644
--- a/src/redist/targets/BundledManifests.targets
+++ b/src/redist/targets/BundledManifests.targets
@@ -66,8 +66,13 @@
     </GenerateGuidFromName>
       
     <ItemGroup>
-      <ManifestContent Include="%(BundledManifests.RestoredNupkgContentPath)\**\*.json;%(BundledManifests.RestoredNupkgContentPath)\**\*.targets"
+      <ManifestContent Include="%(BundledManifests.RestoredNupkgContentPath)\data\**\*"
+                       Condition="Exists('%(RestoredNupkgContentPath)\data')"
                        DestinationPath="%(WorkloadManifestId)/"/>
+
+      <ManifestContent Include="%(BundledManifests.RestoredNupkgContentPath)\**\*.json;%(BundledManifests.RestoredNupkgContentPath)\**\*.targets"
+                       Condition="!Exists('%(BundledManifests.RestoredNupkgContentPath)\data')"
+                       DestinationPath="%(BundledManifests.WorkloadManifestId)/"/>
     </ItemGroup>
 
     <Error Text="No workload manifest content found." Condition="'@(ManifestContent->Count())' == '0'" />

From de3a11e8ea658bf2596a553fc3a2a55f170f69ad Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Mon, 26 Apr 2021 16:55:50 -0500
Subject: [PATCH 2/2] Use latest preview 4 workloads

* xamarin/xamarin-android/release/6.0.1xx-preview4@8fb9195f
* xamarin/xamarin-macos/release/6.0.1xx-preview4@69ceca78
---
 eng/Versions.props | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 5f364053e..c0d0bc46c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -146,11 +146,11 @@
   </PropertyGroup>
   <!-- Workload manifest package versions -->
   <PropertyGroup>
-    <XamarinAndroidWorkloadManifestVersion>11.0.200-ci.main.226</XamarinAndroidWorkloadManifestVersion>
-    <XamarinIOSWorkloadManifestVersion>14.5.100-ci.main.618</XamarinIOSWorkloadManifestVersion>
-    <XamarinMacCatalystWorkloadManifestVersion>14.5.100-ci.main.618</XamarinMacCatalystWorkloadManifestVersion>
-    <XamarinMacOSWorkloadManifestVersion>11.3.100-ci.main.618</XamarinMacOSWorkloadManifestVersion>
-    <XamarinTvOSWorkloadManifestVersion>14.5.100-ci.main.618</XamarinTvOSWorkloadManifestVersion>
+    <XamarinAndroidWorkloadManifestVersion>11.0.200-preview.4.232</XamarinAndroidWorkloadManifestVersion>
+    <XamarinIOSWorkloadManifestVersion>14.5.100-preview.4.623</XamarinIOSWorkloadManifestVersion>
+    <XamarinMacCatalystWorkloadManifestVersion>14.5.100-preview.4.623</XamarinMacCatalystWorkloadManifestVersion>
+    <XamarinMacOSWorkloadManifestVersion>11.3.100-preview.4.623</XamarinMacOSWorkloadManifestVersion>
+    <XamarinTvOSWorkloadManifestVersion>14.5.100-preview.4.623</XamarinTvOSWorkloadManifestVersion>
     <BlazorWorkloadManifestVersion>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</BlazorWorkloadManifestVersion>
   </PropertyGroup>
   <PropertyGroup>