From 5903d28fcb2193a37282614d8e2ed9c2517699bc Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 31 Oct 2018 17:09:41 -0700
Subject: [PATCH 1/2] Update code signing configuration to account for
 crossgen-ed assemblies

---
 build/CodeSign.props | 139 +++++++++++++++++++++++--------------------
 1 file changed, 75 insertions(+), 64 deletions(-)

diff --git a/build/CodeSign.props b/build/CodeSign.props
index 5da99c0af140..428a996a1851 100644
--- a/build/CodeSign.props
+++ b/build/CodeSign.props
@@ -1,49 +1,80 @@
 <Project>
 
+  <PropertyGroup>
+    <!-- TODO - this affects the filename of coreclr components which we want to exclude from signing, such as sos_amd64_amd64_$(CoreClrVersion).dll. Let's figure out a way to identify these exclusions independently from the coreclr version. -->
+    <CoreClrVersion>4.6.27023.02</CoreClrVersion>
+  </PropertyGroup>
+
   <ItemGroup>
     <!-- Third-party components in Microsoft.AspNetCore.All/App which should be signed.  -->
-    <FilesToSign Include="e_sqlite3.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
-    <FilesToSign Include="MessagePack.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
-    <FilesToSign Include="Newtonsoft.Json.Bson.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
-    <FilesToSign Include="Newtonsoft.Json.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.App" />
-    <FilesToSign Include="Remotion.Linq.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.App" />
-    <FilesToSign Include="SQLitePCLRaw.batteries_green.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
-    <FilesToSign Include="SQLitePCLRaw.batteries_v2.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
-    <FilesToSign Include="SQLitePCLRaw.core.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
-    <FilesToSign Include="SQLitePCLRaw.provider.e_sqlite3.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
-    <FilesToSign Include="StackExchange.Redis.StrongName.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
-    <FilesToSign Include="System.Interactive.Async.dll" Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.App" />
+      <!-- Microsoft.AspNetCore.All -->
+      <FilesToSign Include="e_sqlite3.dll"                                                  Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="MessagePack.dll"                                                Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Newtonsoft.Json.Bson.dll"                                       Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="SQLitePCLRaw.batteries_green.dll"                               Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="SQLitePCLRaw.batteries_v2.dll"                                  Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="SQLitePCLRaw.core.dll"                                          Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="SQLitePCLRaw.provider.e_sqlite3.dll"                            Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="StackExchange.Redis.StrongName.dll"                             Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.All" />
+
+      <!-- Microsoft.AspNetCore.App -->
+      <FilesToSign Include="Newtonsoft.Json.dll"                                           Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Remotion.Linq.dll"                                             Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="System.Interactive.Async.dll"                                  Certificate="$(AssemblySigning3rdPartyCertName)" Container="Microsoft.AspNetCore.App" />
+
+    <!-- These files came from the aspnet/Extensions build, but have to be re-signed because we crossgen them. -->
+      <FilesToSign Include="Microsoft.Extensions.DiagnosticAdapter.dll"                     Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.ObjectPool.dll"                            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.Primitives.dll"                            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App"  />
+
+    <!-- These files came from partner teams. They have to be re-signed because we crossgen them and redistributable them in our installers. -->
+
+      <!-- Microsoft.AspNetCore.All -->
+      <FilesToSign Include="Microsoft.AI.DependencyCollector.dll"                           Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.ApplicationInsights.AspNetCore.dll"                   Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.ApplicationInsights.dll"                              Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.Azure.KeyVault.dll"                                   Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.Azure.KeyVault.WebKey.dll"                            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.Azure.Services.AppAuthentication.dll"                 Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.Data.Edm.dll"                                         Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.Data.Edm.resources.dll"                               Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.Data.OData.dll"                                       Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.Data.OData.resources.dll"                             Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.Extensions.PlatformAbstractions.dll"                  Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.IdentityModel.Clients.ActiveDirectory.dll"            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll"   Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.Rest.ClientRuntime.Azure.dll"                         Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.Rest.ClientRuntime.dll"                               Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="Microsoft.WindowsAzure.Storage.dll"                             Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="System.Spatial.dll"                                             Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
 
-    <!-- These files came from the aspnet/Extensions build and should already be signed. -->
-    <FilesToExcludeFromSigning Include="Microsoft.Extensions.DiagnosticAdapter.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Extensions.ObjectPool.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Extensions.Primitives.dll" />
+      <!-- Microsoft.AspNetCore.App -->
+      <FilesToSign Include="Microsoft.CodeAnalysis.CSharp.dll"                              Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.CodeAnalysis.dll"                                     Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.DotNet.PlatformAbstractions.dll"                      Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.Extensions.DependencyModel.dll"                       Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.IdentityModel.JsonWebTokens.dll"                      Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.IdentityModel.Logging.dll"                            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.IdentityModel.Protocols.dll"                          Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.IdentityModel.Protocols.OpenIdConnect.dll"            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.IdentityModel.Protocols.WsFederation.dll"             Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.IdentityModel.Tokens.dll"                             Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.IdentityModel.Tokens.Saml.dll"                        Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="Microsoft.IdentityModel.Xml.dll"                                Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="System.Data.SqlClient.dll"                                      Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="System.IdentityModel.Tokens.Jwt.dll"                            Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="System.IO.Pipelines.dll"                                        Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="System.Net.Http.Formatting.dll"                                 Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="System.Net.WebSockets.WebSocketProtocol.dll"                    Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="System.Runtime.CompilerServices.Unsafe.dll"                     Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="System.Security.Cryptography.Pkcs.dll"                          Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="System.Security.Cryptography.Xml.dll"                           Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="System.Security.Permissions.dll"                                Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="System.Text.Encoding.CodePages.dll"                             Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="System.Text.Encodings.Web.dll"                                  Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
 
     <!-- These files should already be signed already by a different leg of the build. They have to be listed again here because we recreate a redistributable which binaries built in other repos. -->
     <FilesToExcludeFromSigning Include="libuv.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.AI.DependencyCollector.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.ApplicationInsights.AspNetCore.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.ApplicationInsights.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Azure.KeyVault.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Azure.KeyVault.WebKey.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Azure.Services.AppAuthentication.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Data.Edm.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Data.Edm.resources.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Data.OData.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Data.OData.resources.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.IdentityModel.JsonWebTokens.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.IdentityModel.Logging.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.IdentityModel.Protocols.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.IdentityModel.Protocols.OpenIdConnect.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.IdentityModel.Protocols.WsFederation.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.IdentityModel.Tokens.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.IdentityModel.Tokens.Saml.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.IdentityModel.Xml.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Rest.ClientRuntime.Azure.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Rest.ClientRuntime.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.WindowsAzure.Storage.dll" />
 
     <!-- These files should already be signed by the .NET Core team. They have to be listed again here because we recreate a redistributable which includes the Microsoft.NETCore.App runtime. -->
     <FilesToExcludeFromSigning Include="api-ms-win-core-console-l1-1-0.dll" />
@@ -95,28 +126,18 @@
     <FilesToExcludeFromSigning Include="dotnet.exe" />
     <FilesToExcludeFromSigning Include="hostfxr.dll" />
     <FilesToExcludeFromSigning Include="hostpolicy.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.CSharp.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.DiaSymReader.Native.amd64.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.DiaSymReader.Native.arm.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.DiaSymReader.Native.x86.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.DotNet.PlatformAbstractions.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Extensions.DependencyModel.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Extensions.PlatformAbstractions.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.VisualBasic.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Win32.Primitives.dll" />
-    <FilesToExcludeFromSigning Include="Microsoft.Win32.Registry.dll" />
-    <FilesToExcludeFromSigning Include="mscordaccore_amd64_amd64_4.6.27023.02.dll" />
-    <FilesToExcludeFromSigning Include="mscordaccore_arm_arm_4.6.27023.02.dll" />
-    <FilesToExcludeFromSigning Include="mscordaccore_x86_x86_4.6.27023.02.dll" />
+    <FilesToExcludeFromSigning Include="mscordaccore_amd64_amd64_$(CoreClrVersion).dll" />
+    <FilesToExcludeFromSigning Include="mscordaccore_arm_arm_$(CoreClrVersion).dll" />
+    <FilesToExcludeFromSigning Include="mscordaccore_x86_x86_$(CoreClrVersion).dll" />
     <FilesToExcludeFromSigning Include="mscordaccore.dll" />
     <FilesToExcludeFromSigning Include="mscordbi.dll" />
     <FilesToExcludeFromSigning Include="mscorlib.dll" />
     <FilesToExcludeFromSigning Include="mscorrc.debug.dll" />
     <FilesToExcludeFromSigning Include="mscorrc.dll" />
     <FilesToExcludeFromSigning Include="netstandard.dll" />
-    <FilesToExcludeFromSigning Include="sos_amd64_amd64_4.6.27023.02.dll" />
-    <FilesToExcludeFromSigning Include="sos_arm_arm_4.6.27023.02.dll" />
-    <FilesToExcludeFromSigning Include="sos_x86_x86_4.6.27023.02.dll" />
+    <FilesToExcludeFromSigning Include="sos_amd64_amd64_$(CoreClrVersion).dll" />
+    <FilesToExcludeFromSigning Include="sos_arm_arm_$(CoreClrVersion).dll" />
+    <FilesToExcludeFromSigning Include="sos_x86_x86_$(CoreClrVersion).dll" />
     <FilesToExcludeFromSigning Include="sos.dll" />
     <FilesToExcludeFromSigning Include="SOS.NETCore.dll" />
     <FilesToExcludeFromSigning Include="System.AppContext.dll" />
@@ -154,7 +175,6 @@
     <FilesToExcludeFromSigning Include="System.Globalization.Calendars.dll" />
     <FilesToExcludeFromSigning Include="System.Globalization.dll" />
     <FilesToExcludeFromSigning Include="System.Globalization.Extensions.dll" />
-    <FilesToExcludeFromSigning Include="System.IdentityModel.Tokens.Jwt.dll" />
     <FilesToExcludeFromSigning Include="System.IO.Compression.Brotli.dll" />
     <FilesToExcludeFromSigning Include="System.IO.Compression.dll" />
     <FilesToExcludeFromSigning Include="System.IO.Compression.FileSystem.dll" />
@@ -167,7 +187,6 @@
     <FilesToExcludeFromSigning Include="System.IO.FileSystem.Watcher.dll" />
     <FilesToExcludeFromSigning Include="System.IO.IsolatedStorage.dll" />
     <FilesToExcludeFromSigning Include="System.IO.MemoryMappedFiles.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.Pipelines.dll" />
     <FilesToExcludeFromSigning Include="System.IO.Pipes.AccessControl.dll" />
     <FilesToExcludeFromSigning Include="System.IO.Pipes.dll" />
     <FilesToExcludeFromSigning Include="System.IO.UnmanagedMemoryStream.dll" />
@@ -178,7 +197,6 @@
     <FilesToExcludeFromSigning Include="System.Memory.dll" />
     <FilesToExcludeFromSigning Include="System.Net.dll" />
     <FilesToExcludeFromSigning Include="System.Net.Http.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.Http.Formatting.dll" />
     <FilesToExcludeFromSigning Include="System.Net.HttpListener.dll" />
     <FilesToExcludeFromSigning Include="System.Net.Mail.dll" />
     <FilesToExcludeFromSigning Include="System.Net.NameResolution.dll" />
@@ -194,7 +212,6 @@
     <FilesToExcludeFromSigning Include="System.Net.WebProxy.dll" />
     <FilesToExcludeFromSigning Include="System.Net.WebSockets.Client.dll" />
     <FilesToExcludeFromSigning Include="System.Net.WebSockets.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.WebSockets.WebSocketProtocol.dll" />
     <FilesToExcludeFromSigning Include="System.Numerics.dll" />
     <FilesToExcludeFromSigning Include="System.Numerics.Vectors.dll" />
     <FilesToExcludeFromSigning Include="System.ObjectModel.dll" />
@@ -236,10 +253,8 @@
     <FilesToExcludeFromSigning Include="System.Security.Cryptography.Csp.dll" />
     <FilesToExcludeFromSigning Include="System.Security.Cryptography.Encoding.dll" />
     <FilesToExcludeFromSigning Include="System.Security.Cryptography.OpenSsl.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.Cryptography.Pkcs.dll" />
     <FilesToExcludeFromSigning Include="System.Security.Cryptography.Primitives.dll" />
     <FilesToExcludeFromSigning Include="System.Security.Cryptography.X509Certificates.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.Cryptography.Xml.dll" />
     <FilesToExcludeFromSigning Include="System.Security.dll" />
     <FilesToExcludeFromSigning Include="System.Security.Permissions.dll" />
     <FilesToExcludeFromSigning Include="System.Security.Principal.dll" />
@@ -247,13 +262,9 @@
     <FilesToExcludeFromSigning Include="System.Security.SecureString.dll" />
     <FilesToExcludeFromSigning Include="System.ServiceModel.Web.dll" />
     <FilesToExcludeFromSigning Include="System.ServiceProcess.dll" />
-    <FilesToExcludeFromSigning Include="System.Spatial.dll" />
-    <FilesToExcludeFromSigning Include="System.Spatial.resources.dll" />
     <FilesToExcludeFromSigning Include="System.Text.Encoding.dll" />
     <FilesToExcludeFromSigning Include="System.Text.Encoding.Extensions.dll" />
-    <FilesToExcludeFromSigning Include="System.Text.Encodings.Web.dll" />
     <FilesToExcludeFromSigning Include="System.Text.RegularExpressions.dll" />
-    <FilesToExcludeFromSigning Include="System.Threading.Channels.dll" />
     <FilesToExcludeFromSigning Include="System.Threading.dll" />
     <FilesToExcludeFromSigning Include="System.Threading.Overlapped.dll" />
     <FilesToExcludeFromSigning Include="System.Threading.Tasks.Dataflow.dll" />

From 085020b4e1dd4df4b5062502ca796fe02c453e72 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 31 Oct 2018 17:58:05 -0700
Subject: [PATCH 2/2] Update codesigning configuration to automatically skip
 files in Microsoft.NETCore.App

---
 build/CodeSign.props   | 225 +----------------------------------------
 build/CodeSign.targets |   4 +-
 build/SharedFx.targets |  12 ++-
 3 files changed, 17 insertions(+), 224 deletions(-)

diff --git a/build/CodeSign.props b/build/CodeSign.props
index 428a996a1851..50da6efa7fce 100644
--- a/build/CodeSign.props
+++ b/build/CodeSign.props
@@ -1,10 +1,5 @@
 <Project>
 
-  <PropertyGroup>
-    <!-- TODO - this affects the filename of coreclr components which we want to exclude from signing, such as sos_amd64_amd64_$(CoreClrVersion).dll. Let's figure out a way to identify these exclusions independently from the coreclr version. -->
-    <CoreClrVersion>4.6.27023.02</CoreClrVersion>
-  </PropertyGroup>
-
   <ItemGroup>
     <!-- Third-party components in Microsoft.AspNetCore.All/App which should be signed.  -->
       <!-- Microsoft.AspNetCore.All -->
@@ -47,6 +42,7 @@
       <FilesToSign Include="Microsoft.Rest.ClientRuntime.dll"                               Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
       <FilesToSign Include="Microsoft.WindowsAzure.Storage.dll"                             Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
       <FilesToSign Include="System.Spatial.dll"                                             Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
+      <FilesToSign Include="System.Spatial.resources.dll"                                   Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.All" />
 
       <!-- Microsoft.AspNetCore.App -->
       <FilesToSign Include="Microsoft.CodeAnalysis.CSharp.dll"                              Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
@@ -72,225 +68,10 @@
       <FilesToSign Include="System.Security.Permissions.dll"                                Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
       <FilesToSign Include="System.Text.Encoding.CodePages.dll"                             Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
       <FilesToSign Include="System.Text.Encodings.Web.dll"                                  Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
+      <FilesToSign Include="System.Threading.Channels.dll"                                  Certificate="$(AssemblySigningCertName)" Container="Microsoft.AspNetCore.App" />
 
-    <!-- These files should already be signed already by a different leg of the build. They have to be listed again here because we recreate a redistributable which binaries built in other repos. -->
+    <!-- This files should already be signed already by a different leg of the build. They have to be listed again here because we recreate a redistributable which binaries built in other repos. -->
     <FilesToExcludeFromSigning Include="libuv.dll" />
-
-    <!-- These files should already be signed by the .NET Core team. They have to be listed again here because we recreate a redistributable which includes the Microsoft.NETCore.App runtime. -->
-    <FilesToExcludeFromSigning Include="api-ms-win-core-console-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-datetime-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-debug-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-errorhandling-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-file-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-file-l1-2-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-file-l2-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-handle-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-heap-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-interlocked-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-libraryloader-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-localization-l1-2-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-memory-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-namedpipe-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-processenvironment-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-processthreads-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-processthreads-l1-1-1.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-profile-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-rtlsupport-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-string-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-synch-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-synch-l1-2-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-sysinfo-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-timezone-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-core-util-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="API-MS-Win-core-xstate-l2-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-conio-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-convert-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-environment-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-filesystem-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-heap-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-locale-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-math-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-multibyte-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-private-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-process-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-runtime-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-stdio-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-string-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-time-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="api-ms-win-crt-utility-l1-1-0.dll" />
-    <FilesToExcludeFromSigning Include="clrcompression.dll" />
-    <FilesToExcludeFromSigning Include="clretwrc.dll" />
-    <FilesToExcludeFromSigning Include="clrjit.dll" />
-    <FilesToExcludeFromSigning Include="coreclr.dll" />
-    <FilesToExcludeFromSigning Include="dbgshim.dll" />
-    <FilesToExcludeFromSigning Include="dotnet.exe" />
-    <FilesToExcludeFromSigning Include="hostfxr.dll" />
-    <FilesToExcludeFromSigning Include="hostpolicy.dll" />
-    <FilesToExcludeFromSigning Include="mscordaccore_amd64_amd64_$(CoreClrVersion).dll" />
-    <FilesToExcludeFromSigning Include="mscordaccore_arm_arm_$(CoreClrVersion).dll" />
-    <FilesToExcludeFromSigning Include="mscordaccore_x86_x86_$(CoreClrVersion).dll" />
-    <FilesToExcludeFromSigning Include="mscordaccore.dll" />
-    <FilesToExcludeFromSigning Include="mscordbi.dll" />
-    <FilesToExcludeFromSigning Include="mscorlib.dll" />
-    <FilesToExcludeFromSigning Include="mscorrc.debug.dll" />
-    <FilesToExcludeFromSigning Include="mscorrc.dll" />
-    <FilesToExcludeFromSigning Include="netstandard.dll" />
-    <FilesToExcludeFromSigning Include="sos_amd64_amd64_$(CoreClrVersion).dll" />
-    <FilesToExcludeFromSigning Include="sos_arm_arm_$(CoreClrVersion).dll" />
-    <FilesToExcludeFromSigning Include="sos_x86_x86_$(CoreClrVersion).dll" />
-    <FilesToExcludeFromSigning Include="sos.dll" />
-    <FilesToExcludeFromSigning Include="SOS.NETCore.dll" />
-    <FilesToExcludeFromSigning Include="System.AppContext.dll" />
-    <FilesToExcludeFromSigning Include="System.Buffers.dll" />
-    <FilesToExcludeFromSigning Include="System.Collections.Concurrent.dll" />
-    <FilesToExcludeFromSigning Include="System.Collections.dll" />
-    <FilesToExcludeFromSigning Include="System.Collections.Immutable.dll" />
-    <FilesToExcludeFromSigning Include="System.Collections.NonGeneric.dll" />
-    <FilesToExcludeFromSigning Include="System.Collections.Specialized.dll" />
-    <FilesToExcludeFromSigning Include="System.ComponentModel.Annotations.dll" />
-    <FilesToExcludeFromSigning Include="System.ComponentModel.DataAnnotations.dll" />
-    <FilesToExcludeFromSigning Include="System.ComponentModel.dll" />
-    <FilesToExcludeFromSigning Include="System.ComponentModel.EventBasedAsync.dll" />
-    <FilesToExcludeFromSigning Include="System.ComponentModel.Primitives.dll" />
-    <FilesToExcludeFromSigning Include="System.ComponentModel.TypeConverter.dll" />
-    <FilesToExcludeFromSigning Include="System.Configuration.dll" />
-    <FilesToExcludeFromSigning Include="System.Console.dll" />
-    <FilesToExcludeFromSigning Include="System.Core.dll" />
-    <FilesToExcludeFromSigning Include="System.Data.Common.dll" />
-    <FilesToExcludeFromSigning Include="System.Data.dll" />
-    <FilesToExcludeFromSigning Include="System.Diagnostics.Contracts.dll" />
-    <FilesToExcludeFromSigning Include="System.Diagnostics.Debug.dll" />
-    <FilesToExcludeFromSigning Include="System.Diagnostics.DiagnosticSource.dll" />
-    <FilesToExcludeFromSigning Include="System.Diagnostics.FileVersionInfo.dll" />
-    <FilesToExcludeFromSigning Include="System.Diagnostics.Process.dll" />
-    <FilesToExcludeFromSigning Include="System.Diagnostics.StackTrace.dll" />
-    <FilesToExcludeFromSigning Include="System.Diagnostics.TextWriterTraceListener.dll" />
-    <FilesToExcludeFromSigning Include="System.Diagnostics.Tools.dll" />
-    <FilesToExcludeFromSigning Include="System.Diagnostics.TraceSource.dll" />
-    <FilesToExcludeFromSigning Include="System.Diagnostics.Tracing.dll" />
-    <FilesToExcludeFromSigning Include="System.dll" />
-    <FilesToExcludeFromSigning Include="System.Drawing.dll" />
-    <FilesToExcludeFromSigning Include="System.Drawing.Primitives.dll" />
-    <FilesToExcludeFromSigning Include="System.Dynamic.Runtime.dll" />
-    <FilesToExcludeFromSigning Include="System.Globalization.Calendars.dll" />
-    <FilesToExcludeFromSigning Include="System.Globalization.dll" />
-    <FilesToExcludeFromSigning Include="System.Globalization.Extensions.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.Compression.Brotli.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.Compression.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.Compression.FileSystem.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.Compression.ZipFile.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.FileSystem.AccessControl.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.FileSystem.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.FileSystem.DriveInfo.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.FileSystem.Primitives.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.FileSystem.Watcher.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.IsolatedStorage.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.MemoryMappedFiles.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.Pipes.AccessControl.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.Pipes.dll" />
-    <FilesToExcludeFromSigning Include="System.IO.UnmanagedMemoryStream.dll" />
-    <FilesToExcludeFromSigning Include="System.Linq.dll" />
-    <FilesToExcludeFromSigning Include="System.Linq.Expressions.dll" />
-    <FilesToExcludeFromSigning Include="System.Linq.Parallel.dll" />
-    <FilesToExcludeFromSigning Include="System.Linq.Queryable.dll" />
-    <FilesToExcludeFromSigning Include="System.Memory.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.Http.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.HttpListener.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.Mail.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.NameResolution.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.NetworkInformation.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.Ping.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.Primitives.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.Requests.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.Security.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.ServicePoint.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.Sockets.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.WebClient.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.WebHeaderCollection.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.WebProxy.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.WebSockets.Client.dll" />
-    <FilesToExcludeFromSigning Include="System.Net.WebSockets.dll" />
-    <FilesToExcludeFromSigning Include="System.Numerics.dll" />
-    <FilesToExcludeFromSigning Include="System.Numerics.Vectors.dll" />
-    <FilesToExcludeFromSigning Include="System.ObjectModel.dll" />
-    <FilesToExcludeFromSigning Include="System.Private.CoreLib.dll" />
-    <FilesToExcludeFromSigning Include="System.Private.DataContractSerialization.dll" />
-    <FilesToExcludeFromSigning Include="System.Private.Uri.dll" />
-    <FilesToExcludeFromSigning Include="System.Private.Xml.dll" />
-    <FilesToExcludeFromSigning Include="System.Private.Xml.Linq.dll" />
-    <FilesToExcludeFromSigning Include="System.Reflection.DispatchProxy.dll" />
-    <FilesToExcludeFromSigning Include="System.Reflection.dll" />
-    <FilesToExcludeFromSigning Include="System.Reflection.Emit.dll" />
-    <FilesToExcludeFromSigning Include="System.Reflection.Emit.ILGeneration.dll" />
-    <FilesToExcludeFromSigning Include="System.Reflection.Emit.Lightweight.dll" />
-    <FilesToExcludeFromSigning Include="System.Reflection.Extensions.dll" />
-    <FilesToExcludeFromSigning Include="System.Reflection.Metadata.dll" />
-    <FilesToExcludeFromSigning Include="System.Reflection.Primitives.dll" />
-    <FilesToExcludeFromSigning Include="System.Reflection.TypeExtensions.dll" />
-    <FilesToExcludeFromSigning Include="System.Resources.Reader.dll" />
-    <FilesToExcludeFromSigning Include="System.Resources.ResourceManager.dll" />
-    <FilesToExcludeFromSigning Include="System.Resources.Writer.dll" />
-    <FilesToExcludeFromSigning Include="System.Runtime.CompilerServices.VisualC.dll" />
-    <FilesToExcludeFromSigning Include="System.Runtime.dll" />
-    <FilesToExcludeFromSigning Include="System.Runtime.Extensions.dll" />
-    <FilesToExcludeFromSigning Include="System.Runtime.Handles.dll" />
-    <FilesToExcludeFromSigning Include="System.Runtime.InteropServices.dll" />
-    <FilesToExcludeFromSigning Include="System.Runtime.InteropServices.RuntimeInformation.dll" />
-    <FilesToExcludeFromSigning Include="System.Runtime.InteropServices.WindowsRuntime.dll" />
-    <FilesToExcludeFromSigning Include="System.Runtime.Loader.dll" />
-    <FilesToExcludeFromSigning Include="System.Runtime.Numerics.dll" />
-    <FilesToExcludeFromSigning Include="System.Runtime.Serialization.dll" />
-    <FilesToExcludeFromSigning Include="System.Runtime.Serialization.Formatters.dll" />
-    <FilesToExcludeFromSigning Include="System.Runtime.Serialization.Json.dll" />
-    <FilesToExcludeFromSigning Include="System.Runtime.Serialization.Primitives.dll" />
-    <FilesToExcludeFromSigning Include="System.Runtime.Serialization.Xml.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.AccessControl.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.Claims.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.Cryptography.Algorithms.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.Cryptography.Cng.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.Cryptography.Csp.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.Cryptography.Encoding.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.Cryptography.OpenSsl.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.Cryptography.Primitives.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.Cryptography.X509Certificates.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.Permissions.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.Principal.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.Principal.Windows.dll" />
-    <FilesToExcludeFromSigning Include="System.Security.SecureString.dll" />
-    <FilesToExcludeFromSigning Include="System.ServiceModel.Web.dll" />
-    <FilesToExcludeFromSigning Include="System.ServiceProcess.dll" />
-    <FilesToExcludeFromSigning Include="System.Text.Encoding.dll" />
-    <FilesToExcludeFromSigning Include="System.Text.Encoding.Extensions.dll" />
-    <FilesToExcludeFromSigning Include="System.Text.RegularExpressions.dll" />
-    <FilesToExcludeFromSigning Include="System.Threading.dll" />
-    <FilesToExcludeFromSigning Include="System.Threading.Overlapped.dll" />
-    <FilesToExcludeFromSigning Include="System.Threading.Tasks.Dataflow.dll" />
-    <FilesToExcludeFromSigning Include="System.Threading.Tasks.dll" />
-    <FilesToExcludeFromSigning Include="System.Threading.Tasks.Extensions.dll" />
-    <FilesToExcludeFromSigning Include="System.Threading.Tasks.Parallel.dll" />
-    <FilesToExcludeFromSigning Include="System.Threading.Thread.dll" />
-    <FilesToExcludeFromSigning Include="System.Threading.ThreadPool.dll" />
-    <FilesToExcludeFromSigning Include="System.Threading.Timer.dll" />
-    <FilesToExcludeFromSigning Include="System.Transactions.dll" />
-    <FilesToExcludeFromSigning Include="System.Transactions.Local.dll" />
-    <FilesToExcludeFromSigning Include="System.ValueTuple.dll" />
-    <FilesToExcludeFromSigning Include="System.Web.dll" />
-    <FilesToExcludeFromSigning Include="System.Web.HttpUtility.dll" />
-    <FilesToExcludeFromSigning Include="System.Windows.dll" />
-    <FilesToExcludeFromSigning Include="System.Xml.dll" />
-    <FilesToExcludeFromSigning Include="System.Xml.Linq.dll" />
-    <FilesToExcludeFromSigning Include="System.Xml.ReaderWriter.dll" />
-    <FilesToExcludeFromSigning Include="System.Xml.Serialization.dll" />
-    <FilesToExcludeFromSigning Include="System.Xml.XDocument.dll" />
-    <FilesToExcludeFromSigning Include="System.Xml.XmlDocument.dll" />
-    <FilesToExcludeFromSigning Include="System.Xml.XmlSerializer.dll" />
-    <FilesToExcludeFromSigning Include="System.Xml.XPath.dll" />
-    <FilesToExcludeFromSigning Include="System.Xml.XPath.XDocument.dll" />
-    <FilesToExcludeFromSigning Include="ucrtbase.dll" />
-    <FilesToExcludeFromSigning Include="WindowsBase.dll" />
   </ItemGroup>
 
 </Project>
diff --git a/build/CodeSign.targets b/build/CodeSign.targets
index f42dcd8afc5f..032fbd1c84d1 100644
--- a/build/CodeSign.targets
+++ b/build/CodeSign.targets
@@ -5,6 +5,7 @@
   </PropertyGroup>
 
   <Target Name="CollectFileSignInfo" DependsOnTargets="_PrepareRepositories">
+
     <ItemGroup>
       <_RepositoryProject Remove="@(_RepositoryProject)" />
       <_RepositoryProject Include="$(MSBuildProjectFullPath)" Condition="'%(Repository.Identity)' != ''">
@@ -39,7 +40,8 @@
       <FilesToSign Include="@(_FilesToSign)" />
 
       <FilesToExcludeFromSigning Include="@(_RepoFileSignInfo->'%(FileName)%(Extension)')" Condition="'%(_RepoFileSignInfo.IsFileToExcludeFromSign)' == 'true'" />
-      <!-- Workaround for the way we have both repo and Universe builds. This prevents duplicate configuration between 'exclude' and 'sign' options. -->
+      <!-- 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>
diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index 1fce8b8d9f83..bbdf2998f539 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -7,6 +7,7 @@
     <CodeSignDependsOn>$(CodeSignDependsOn);GetSharedFxFilesToSign</CodeSignDependsOn>
     <BuildSharedFxDependsOn>_BuildSharedFxProjects;TestSharedFx</BuildSharedFxDependsOn>
     <BuildSharedFxDependsOn Condition="'$(TestOnly)' != 'true'">$(BuildSharedFxDependsOn);CodeSign</BuildSharedFxDependsOn>
+    <RedistNetCorePath>$(IntermediateDir)ar\$(SharedFxRid)\</RedistNetCorePath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,7 +22,8 @@
 
   <Target Name="GetSharedFxFilesToSign">
     <ItemGroup>
-      <FilesToSign Include="$(ArtifactsDir)$(Configuration)\installers\*.zip" Certificate="None" />
+      <FilesToSign Include="$(ArtifactsDir)$(Configuration)\installers\aspnetcore-runtime-$(PackageVersion)-$(SharedFxRid).zip" Certificate="None" />
+      <FilesToSign Include="$(ArtifactsDir)$(Configuration)\installers\aspnetcore-runtime-internal-$(PackageVersion)-$(SharedFxRid).zip" Certificate="None" />
       <FilesToSign Include="$(BuildDir)Microsoft.AspNetCore.App.$(PackageVersion).nupkg" Certificate="$(PackageSigningCertName)" />
       <FilesToSign Include="$(BuildDir)Microsoft.AspNetCore.All.$(PackageVersion).nupkg" Certificate="$(PackageSigningCertName)" />
       <FilesToSign Include="$(BuildDir)runtime.$(SharedFxRid).Microsoft.AspNetCore.App.$(PackageVersion).nupkg" Certificate="$(PackageSigningCertName)" />
@@ -29,6 +31,14 @@
       <FilesToSign Include="$(BuildDir)runtime.$(SharedFxRid).Microsoft.AspNetCore.App.$(PackageVersion).symbols.nupkg" Certificate="$(PackageSigningCertName)" />
       <FilesToSign Include="$(BuildDir)runtime.$(SharedFxRid).Microsoft.AspNetCore.All.$(PackageVersion).symbols.nupkg" Certificate="$(PackageSigningCertName)" />
     </ItemGroup>
+
+    <!-- These files should already be signed by the .NET Core team. They have to be listed again here because we recreate a redistributable which includes the Microsoft.NETCore.App runtime. -->
+    <ItemGroup>
+      <FilesToExcludeFromSigning Include="$(RedistNetCorePath)shared\Microsoft.NETCore.App\**\*.dll" />
+      <FilesToExcludeFromSigning Include="$(RedistNetCorePath)host\**\*.dll" />
+      <FilesToExcludeFromSigning Include="$(RedistNetCorePath)dotnet.exe" />
+    </ItemGroup>
+
   </Target>
 
   <Target Name="_BuildSharedFxProjects" DependsOnTargets="GeneratePropsFiles;ResolveCommitHash">