From 51761c3c5d4d98b551119ddc9bbcf2df22a3f20b Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Mon, 28 Jan 2019 18:24:37 -0800
Subject: [PATCH] Handle code-signing exclusions when building for multiple
 architectures on the same machine

---
 build/CodeSign.targets | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/build/CodeSign.targets b/build/CodeSign.targets
index a32d135c33..71e5d8a1bf 100644
--- a/build/CodeSign.targets
+++ b/build/CodeSign.targets
@@ -2,10 +2,14 @@
 
   <PropertyGroup>
     <CodeSignDependsOn>$(CodeSignDependsOn);CollectFileSignInfo</CodeSignDependsOn>
-    <RedistNetCorePath>$(IntermediateDir)ar\$(SharedFxRid)\</RedistNetCorePath>
   </PropertyGroup>
 
   <Target Name="CollectFileSignInfo">
+    <PropertyGroup>
+      <BaseRedistNetCorePath>$(IntermediateDir)ar\</BaseRedistNetCorePath>
+      <RedistNetCorePath>$(BaseRedistNetCorePath)$(SharedFxRid)\</RedistNetCorePath>
+    </PropertyGroup>
+
     <ItemGroup>
       <FilesToSign Include="$(ArtifactsShippingPackagesDir)*.jar" Certificate="MicrosoftJAR" />
       <FilesToSign Include="$(ArtifactsShippingPackagesDir)*.nupkg" Exclude="$(ArtifactsShippingPackagesDir)*.symbols.nupkg" Certificate="NuGet" />
@@ -14,9 +18,17 @@
       <!-- "None" means don't sign the .zip file itself, but still scan the contents of the .zip for signable files. -->
       <FilesToSign Include="$(InstallersOutputPath)*.zip" Certificate="None" />
 
-      <!-- These files should already be signed by the .NET Core team. They have to be listed again here because we recreate a redistributable which includes the Microsoft.NETCore.App runtime. -->
-      <FilesToExcludeFromSigning Include="$(RedistNetCorePath)shared\Microsoft.NETCore.App\**\*.dll" />
-      <FilesToExcludeFromSigning Include="$(RedistNetCorePath)host\**\*.dll" />
+      <!--
+        These files should already be signed by the .NET Core team. They have to be listed again here because we recreate a redistributable which includes the Microsoft.NETCore.App runtime.
+        List all combinations of Windows RID's because CI may build multiple combinations of artitectures on the same machine.
+        This uses globs because some of the file names change on every build of .NET Core, like sos_amd64_$(fileversion).dll.
+      -->
+      <FilesToExcludeFromSigning Include="$(BaseRedistNetCorePath)win-x64\shared\Microsoft.NETCore.App\**\*.dll" />
+      <FilesToExcludeFromSigning Include="$(BaseRedistNetCorePath)win-x86\shared\Microsoft.NETCore.App\**\*.dll" />
+      <FilesToExcludeFromSigning Include="$(BaseRedistNetCorePath)win-arm\shared\Microsoft.NETCore.App\**\*.dll" />
+      <FilesToExcludeFromSigning Include="$(BaseRedistNetCorePath)win-x64\host\**\*.dll" />
+      <FilesToExcludeFromSigning Include="$(BaseRedistNetCorePath)win-x86\host\**\*.dll" />
+      <FilesToExcludeFromSigning Include="$(BaseRedistNetCorePath)win-arm\host\**\*.dll" />
       <FilesToExcludeFromSigning Include="$(RedistNetCorePath)dotnet.exe" />
     </ItemGroup>
   </Target>