From 289050b9f2f208dce4bd2707456269b61e1822bd Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 14 Nov 2018 15:14:27 -0800
Subject: [PATCH] Normalize code sign metadata to avoid duplication between
 projects and cross-gen config settings

---
 build/CodeSign.targets | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build/CodeSign.targets b/build/CodeSign.targets
index a7ad37a754..13d89fc64f 100644
--- a/build/CodeSign.targets
+++ b/build/CodeSign.targets
@@ -52,11 +52,17 @@
       <_FilesToSign Include="@(_ShippedRepoFileSignInfo)" Condition="'%(_ShippedRepoFileSignInfo.IsFileToSign)' == 'true' AND '%(_ShippedRepoFileSignInfo.Container)' != '' " />
       <FilesToSign Include="@(_FilesToSign)" />
 
+      <!-- Normalize FilesToExcludeFromSigning to filename + extension. -->
+      <_Temp Remove="@(_Temp)" />
+      <_Temp Include="@(FilesToExcludeFromSigning)" />
+      <FilesToExcludeFromSigning Remove="@(FilesToExcludeFromSigning)" />
+      <FilesToExcludeFromSigning Include="@(_Temp->'%(FileName)%(Extension)')" />
+      <_Temp Remove="@(_Temp)" />
+
       <FilesToExcludeFromSigning Include="@(_ShippedRepoFileSignInfo->'%(FileName)%(Extension)')" Condition="'%(_ShippedRepoFileSignInfo.IsFileToExcludeFromSign)' == 'true'" />
       <FilesToExcludeFromSigning Include="@(_RepoFileSignInfo->'%(FileName)%(Extension)')" Condition="'%(_RepoFileSignInfo.IsFileToExcludeFromSign)' == 'true'" />
       <!-- Workaround for the way we have both repo and Universe builds, crossgen AND uncrossgened outputs. This prevents duplicate configuration between 'exclude' and 'sign' options. -->
       <FilesToExcludeFromSigning Remove="@(FilesToSign->'%(FileName)%(Extension)')" />
-      <FilesToExcludeFromSigning Remove="@(_FilesToSign->'%(FileName)%(Extension)')" />
     </ItemGroup>
   </Target>