From 5ed71702fd0335604817aafc457ad83c25617485 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 12 May 2021 09:30:52 -0700
Subject: [PATCH 1/2] Use dotnet certificate

---
 eng/Signing.props | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/eng/Signing.props b/eng/Signing.props
index 8969d795fee..ed3c04522d5 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -2,4 +2,11 @@
     <ItemGroup>
 		<ItemsToSign Include="$(VisualStudioSetupInsertionPath)Microsoft.Build.UnGAC.exe" />
 	</ItemGroup>
+
+    <!-- Since this repo isn't on Arcade 6, UseDotNetCertificate is not available. Do the update here instead. -->
+    <ItemGroup>
+      <FileExtensionSignInfo Update="@(FileExtensionSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
+      <StrongNameSignInfo Update="@(StrongNameSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
+      <FileSignInfo Update="@(FileSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
+    </ItemGroup>
 </Project>
\ No newline at end of file

From 32d8b6f94feb43bc6954bd1fec98818ec576d6d9 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 2 Jun 2021 10:24:19 -0700
Subject: [PATCH 2/2] Switch methods

---
 eng/Signing.props | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/eng/Signing.props b/eng/Signing.props
index ed3c04522d5..66347f3d9d1 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -1,12 +1,9 @@
 <Project>
-    <ItemGroup>
-		<ItemsToSign Include="$(VisualStudioSetupInsertionPath)Microsoft.Build.UnGAC.exe" />
-	</ItemGroup>
-
-    <!-- Since this repo isn't on Arcade 6, UseDotNetCertificate is not available. Do the update here instead. -->
-    <ItemGroup>
-      <FileExtensionSignInfo Update="@(FileExtensionSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
-      <StrongNameSignInfo Update="@(StrongNameSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
-      <FileSignInfo Update="@(FileSignInfo->WithMetadataValue('CertificateName','Microsoft400'))" CertificateName="MicrosoftDotNet500" />
-    </ItemGroup>
+  <ItemGroup>
+    <ItemsToSign Include="$(VisualStudioSetupInsertionPath)Microsoft.Build.UnGAC.exe" />
+  </ItemGroup>
+    
+  <PropertyGroup>
+    <UseDotNetCertificate>true</UseDotNetCertificate>
+  </PropertyGroup>
 </Project>
\ No newline at end of file