Преглед на файлове

Normalize code sign metadata to avoid duplication between projects and cross-gen config settings

Nate McMaster преди 7 години
родител
ревизия
289050b9f2
променени са 1 файла, в които са добавени 7 реда и са изтрити 1 реда
  1. 7 1
      build/CodeSign.targets

+ 7 - 1
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>