From 84fd6c272a16344be44f4c889b3efdbc86f4e0f5 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsroft.com>
Date: Thu, 2 Dec 2021 16:46:53 -0800
Subject: [PATCH] Don't try to validate signing for workload manifests that
 will be signed as part of post-build signing

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

diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets
index 516ce70b1..e56e1af3f 100644
--- a/src/redist/targets/BundledManifests.targets
+++ b/src/redist/targets/BundledManifests.targets
@@ -51,7 +51,12 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <SignCheckWorkloadManifestMsiInputFiles Include="@(BundledManifests->'%(RestoredMsiPathInNupkg)')" />
+      <!-- Don't try to validate signing for workload manifests that will be signed as part of post-build signing -->
+      <BundledManifestsToValidateSigning Include="@(BundledManifests)"
+                                         Exclude="Microsoft.NET.Workload.Mono.ToolChain;
+                                                  Microsoft.NET.Workload.Emscripten" />
+      
+      <SignCheckWorkloadManifestMsiInputFiles Include="@(BundledManifestsToValidateSigning->'%(RestoredMsiPathInNupkg)')" />
     </ItemGroup>
 
     <Exec Command="$(SignCheckExe) ^