From 954ca9c98b4a5fede505bfabffbdd76ec01461ac Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Tue, 25 Aug 2020 13:04:25 -0700
Subject: [PATCH] Fix signing in official build with 3rd party libraries
 (#41346)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* Fix signing in official build with 3rd party libraries

* Update eng/Signing.props

Co-authored-by: Alexander Köplinger <alex.koeplinger@outlook.com>
---
 eng/Signing.props | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/eng/Signing.props b/eng/Signing.props
index 5b7461f..1ca34c1 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -28,6 +28,13 @@
 
       <!-- apphost and comhost template files are not signed, by design. -->
       <FileSignInfo Include="apphost.exe;singlefilehost.exe;comhost.dll" CertificateName="None" />
+
+      <!-- Third-party components which should be signed.  -->
+      <FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="3PartySHA2" />
+      <FileSignInfo Include="Mono.Cecil.dll" CertificateName="3PartySHA2" />
+      <FileSignInfo Include="Mono.Cecil.Mdb.dll" CertificateName="3PartySHA2" />
+      <FileSignInfo Include="Mono.Cecil.Pdb.dll" CertificateName="3PartySHA2" />
+      <FileSignInfo Include="Mono.Cecil.Rocks.dll" CertificateName="3PartySHA2" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(CrossTargetComponentFolder)' != ''">
@@ -109,14 +116,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <!-- External files -->
-      <ItemsToSign Remove="@(ItemsToSign->WithMetadataValue('Filename', 'Newtonsoft.Json'))" />
-      <ItemsToSign Remove="@(ItemsToSign->WithMetadataValue('Filename', 'Mono.Cecil'))" />
-      <ItemsToSign Remove="@(ItemsToSign->WithMetadataValue('Filename', 'Mono.Cecil.Pdb'))" />
-      <ItemsToSign Remove="@(ItemsToSign->WithMetadataValue('Filename', 'Mono.Cecil.Rocks'))" />
-    </ItemGroup>
-
-    <ItemGroup>
       <ItemsToSign Update="@(ItemsToSign)" Authenticode="$(CertificateId)" />
     </ItemGroup>
 
-- 
2.7.4