From 2c17f40ecf562eb34f1bdf819f9ea5be0f50d2d7 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Thu, 10 Mar 2022 14:03:12 -0800
Subject: [PATCH 1/2] Remove maui workloads from 6.0.100

The old workloads break MU so we either have to update them or remove them.
---
 src/redist/targets/BundledManifests.targets | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets
index b83c642f3..567650af5 100644
--- a/src/redist/targets/BundledManifests.targets
+++ b/src/redist/targets/BundledManifests.targets
@@ -1,11 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <BundledManifests Include="Microsoft.NET.Sdk.Android" FeatureBand="6.0.100" Version="$(XamarinAndroidWorkloadManifestVersion)" />
-    <BundledManifests Include="Microsoft.NET.Sdk.iOS" FeatureBand="6.0.100" Version="$(XamarinIOSWorkloadManifestVersion)" />
-    <BundledManifests Include="Microsoft.NET.Sdk.MacCatalyst" FeatureBand="6.0.100" Version="$(XamarinMacCatalystWorkloadManifestVersion)" />
-    <BundledManifests Include="Microsoft.NET.Sdk.macOS" FeatureBand="6.0.100" Version="$(XamarinMacOSWorkloadManifestVersion)" />
-    <BundledManifests Include="Microsoft.NET.Sdk.Maui" FeatureBand="6.0.100" Version="$(MauiWorkloadManifestVersion)" />
-    <BundledManifests Include="Microsoft.NET.Sdk.tvOS" FeatureBand="6.0.100" Version="$(XamarinTvOSWorkloadManifestVersion)" />
     <BundledManifests Include="Microsoft.NET.Workload.Mono.ToolChain" FeatureBand="6.0.100" Version="$(MonoWorkloadManifestVersion)" />
     <BundledManifests Include="Microsoft.NET.Workload.Emscripten" FeatureBand="6.0.100" Version="$(EmscriptenWorkloadManifestVersion)" />
   </ItemGroup>

From 290291a0da348b11593a521c6f0fb20e69638e1a Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Thu, 17 Feb 2022 14:20:45 -0800
Subject: [PATCH 2/2] Only do signcheck if there are files to sign check

---
 src/redist/targets/BundledManifests.targets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets
index 567650af5..3f8f9ea42 100644
--- a/src/redist/targets/BundledManifests.targets
+++ b/src/redist/targets/BundledManifests.targets
@@ -52,7 +52,8 @@
       <SignCheckWorkloadManifestMsiInputFiles Include="@(BundledManifestsToValidateSigning->'%(RestoredMsiPathInNupkg)')" />
     </ItemGroup>
 
-    <Exec Command="$(SignCheckExe) ^
+    <Exec Condition="'@(SignCheckWorkloadManifestMsiInputFiles->Count())' != '0'" 
+                   Command="$(SignCheckExe) ^
                    --recursive ^
                    -f UnsignedFiles ^
                    -i @(SignCheckWorkloadManifestMsiInputFiles, ' ') ^