From 0633337f7e7317591d1813a2855e13dff7941246 Mon Sep 17 00:00:00 2001
From: Prashanth Govindarajan <prgovi@microsoft.com>
Date: Mon, 10 May 2021 09:55:23 -0700
Subject: [PATCH 1/2] Use dotnet certificate

---
 eng/Signing.props | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/eng/Signing.props b/eng/Signing.props
index 5213afc61e..7d99d0d9aa 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -2,7 +2,7 @@
     <ItemGroup Condition="'$(SignBinaries)' == 'true'">
         <ItemsToSign Remove="@(ItemsToSign)" />
         <ItemsToSign Include="$(ArtifactsDir)pkgassets\**\*.dll" />
-        <FileExtensionSignInfo Include="*.dll" CertificateName="Microsoft400" />
+        <FileExtensionSignInfo Include="*.dll" CertificateName="MicrosoftDotNet500" />
     </ItemGroup>
     <ItemGroup Condition="'$(SignNugetPackages)' == 'true'">
         <ItemsToSign Remove="@(ItemsToSign)" />
@@ -11,4 +11,11 @@
         <FileExtensionSignInfo Include="*.nupkg" CertificateName="NuGet" />
         <FileExtensionSignInfo Include="*.snupkg" CertificateName="NuGet" />
     </ItemGroup>
+
+    <!-- Since this repo isn't on Arcade 6, the UseDotNetCertificate optionis 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 ed9a93f4b37f3dad24f8c317bd602d28eaa10728 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Wed, 12 May 2021 10:59:24 -0700
Subject: [PATCH 2/2] Update 3.1 SDK

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index ee6291512f..30229026f6 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
 	"tools": {
-	  "dotnet": "3.1.102",
+	  "dotnet": "3.1.409",
 	  "runtimes": {
 		"dotnet/x64": ["$(MicrosoftNETCorePlatformsVersion)", "$(MicrosoftNETCore3PlatformsVersion)"],
 		"dotnet/x86": ["$(MicrosoftNETCorePlatformsVersion)", "$(MicrosoftNETCore3PlatformsVersion)"]