From 02696474a1a8dd8769a50922c7dd825993682560 Mon Sep 17 00:00:00 2001
From: Sarah Oslund <sfoslund@microsoft.com>
Date: Fri, 12 Mar 2021 10:00:04 -0800
Subject: [PATCH] Adding xamarin workload manifests

---
 eng/Versions.props                          |  5 +++++
 src/redist/targets/BundledManifests.targets | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 33fa1c88c..64b589297 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -144,8 +144,13 @@
     <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
     <MicrosoftNETTestSdkVersion>16.10.0-preview-20210304-04</MicrosoftNETTestSdkVersion>
   </PropertyGroup>
+  <!-- Workload manifest package versions -->
   <PropertyGroup>
     <XamarinAndroidWorkloadManifestVersion>11.2.0-ci.d16-9.0</XamarinAndroidWorkloadManifestVersion>
+    <XamarinIOSWorkloadManifestVersion>14.4.100-ci.pr.gh10849.1206</XamarinIOSWorkloadManifestVersion>
+    <XamarinMacCatalystWorkloadManifestVersion>14.3.100-ci.pr.gh10849.351</XamarinMacCatalystWorkloadManifestVersion>
+    <XamarinMacOSWorkloadManifestVersion>11.1.100-ci.pr.gh10849.1259</XamarinMacOSWorkloadManifestVersion>
+    <XamarinTvOSWorkloadManifestVersion>14.3.100-ci.pr.gh10849.1259</XamarinTvOSWorkloadManifestVersion>
     <BlazorWorkloadManifestVersion>6.0.0-preview.3.21161.5</BlazorWorkloadManifestVersion>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets
index e87265be4..ce4cbcbc9 100644
--- a/src/redist/targets/BundledManifests.targets
+++ b/src/redist/targets/BundledManifests.targets
@@ -2,12 +2,20 @@
 
   <ItemGroup>
     <BundledManifests Include="Microsoft.NET.Workload.Android" Version="$(XamarinAndroidWorkloadManifestVersion)" WorkloadId="Microsoft.NET.Workload.Android" />
+    <BundledManifests Include="Microsoft.NET.Workload.iOS" Version="$(XamarinIOSWorkloadManifestVersion)" WorkloadId="Microsoft.NET.Workload.iOS" />
+    <BundledManifests Include="Microsoft.NET.Workload.MacCatalyst" Version="$(XamarinMacCatalystWorkloadManifestVersion)" WorkloadId="Microsoft.NET.Workload.MacCatalyst" />
+    <BundledManifests Include="Microsoft.NET.Workload.macOS" Version="$(XamarinMacOSWorkloadManifestVersion)" WorkloadId="Microsoft.NET.Workload.macOS" />
+    <BundledManifests Include="Microsoft.NET.Workload.tvOS" Version="$(XamarinTvOSWorkloadManifestVersion)" WorkloadId="Microsoft.NET.Workload.tvOS" />
     <BundledManifests Include="Microsoft.NET.Sdk.BlazorWebAssembly.AOT" Version="$(BlazorWorkloadManifestVersion)" WorkloadId="Microsoft.NET.Workload.BlazorWebAssembly" />
   </ItemGroup>
 
   <!-- Restore workload manifests via PackageReference -->
   <ItemGroup>
-    <PackageReference Include="@(BundledManifests)" />
+    <BundledManifestsForPackageDownload Include="@(BundledManifests)" >
+      <Version>[%(Version)]</Version>
+    </BundledManifestsForPackageDownload>
+  
+    <PackageDownload Include="@(BundledManifestsForPackageDownload)" />
   </ItemGroup>
 
   <Target Name="LayoutManifests"
@@ -34,7 +42,7 @@
     
     <PropertyGroup>
       <ManifestsMSIInstallerFile>$(ArtifactsNonShippingPackagesDir)dotnet-sdkmanifests-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</ManifestsMSIInstallerFile>
-      <ManifestsDependencyKeyName>SDK_Manifests_$([System.String]::Copy('$(Version)').Replace('-', '_'))</ManifestsDependencyKeyName>
+      <ManifestsDependencyKeyName>SDK_Manifests_$([MSBuild]::ValueOrDefault('$(Version)', '').Replace('-', '_'))</ManifestsDependencyKeyName>
       <ManifestsBrandName>Microsoft .NET SDK Workload Manifests $(Version)</ManifestsBrandName>
       <ManifestsLayoutPath>$(BaseOutputPath)$(Configuration)\sdk-manifests</ManifestsLayoutPath>
     </PropertyGroup>