From 124b6ba9a193ce9753b06e0bae4725a6bd3d8342 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 5 Jun 2018 22:31:24 -0700
Subject: [PATCH] Add certificate names for code signing

---
 Directory.Build.props                         |  3 +-
 NuGetPackageVerifier.json                     | 65 +------------------
 korebuild-lock.txt                            |  4 +-
 src/dotnet-sql-cache/dotnet-sql-cache.csproj  | 13 ++++
 .../dotnet-user-secrets.csproj                | 19 ++++++
 5 files changed, 38 insertions(+), 66 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 29d623306f..8ca8a8757b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -14,8 +14,9 @@
     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
-    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
+    <PackageSigningCertName>MicrosoftNuGet</PackageSigningCertName>
     <AssemblySigningCertName>Microsoft</AssemblySigningCertName>
+    <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 
     <!-- Binary compatiblity is not a goal for command-line tools. -->
diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index 6503b35342..fb43448889 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -12,73 +12,12 @@
       "dotnet-sql-cache": {
         "packageTypes": [
           "DotnetTool"
-        ],
-        "Exclusions": {
-          "NEUTRAL_RESOURCES_LANGUAGE": {
-            "tools/netcoreapp2.2/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
-          },
-          "WRONG_PUBLICKEYTOKEN": {
-            "tools/netcoreapp2.2/any/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg."
-          },
-          "ASSEMBLY_INFORMATIONAL_VERSION_MISMATCH": {
-            "tools/netcoreapp2.2/any/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg."
-          },
-          "ASSEMBLY_FILE_VERSION_MISMATCH": {
-            "tools/netcoreapp2.2/any/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg."
-          },
-          "ASSEMBLY_VERSION_MISMATCH": {
-            "tools/netcoreapp2.2/any/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll": "Assembly is built by another project but bundled in our nupkg."
-          }
-        }
+        ]
       },
       "dotnet-user-secrets": {
         "packageTypes": [
           "DotnetTool"
-        ],
-        "Exclusions": {
-          "NEUTRAL_RESOURCES_LANGUAGE": {
-            "tools/netcoreapp2.2/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
-          },
-          "SERVICING_ATTRIBUTE": {
-            "tools/netcoreapp2.2/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg."
-          },
-          "WRONG_PUBLICKEYTOKEN": {
-            "tools/netcoreapp2.2/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
-          },
-          "ASSEMBLY_INFORMATIONAL_VERSION_MISMATCH": {
-            "tools/netcoreapp2.2/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
-          },
-          "ASSEMBLY_FILE_VERSION_MISMATCH": {
-            "tools/netcoreapp2.2/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
-          },
-          "ASSEMBLY_VERSION_MISMATCH": {
-            "tools/netcoreapp2.2/any/Newtonsoft.Json.dll": "Assembly is built by another project but bundled in our nupkg.",
-            "tools/netcoreapp2.2/any/System.Runtime.CompilerServices.Unsafe.dll": "Assembly is built by another project but bundled in our nupkg."
-          }
-        }
+        ]
       },
       "dotnet-dev-certs": {
         "packageTypes": [
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 34bf7eb808..2dedb9dd4c 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.2.0-preview1-17067
-commithash:2af0e2e3d02329b4f0290061ab9bd8c7ca1aa26f
+version:2.2.0-preview1-17075
+commithash:d9f07c7f313a0af1d49f003f5424b4dbbdd3e09f
diff --git a/src/dotnet-sql-cache/dotnet-sql-cache.csproj b/src/dotnet-sql-cache/dotnet-sql-cache.csproj
index 3949d90be0..4ab0f3425c 100644
--- a/src/dotnet-sql-cache/dotnet-sql-cache.csproj
+++ b/src/dotnet-sql-cache/dotnet-sql-cache.csproj
@@ -22,4 +22,17 @@
     <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- These files should be signed by corefx -->
+    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/win-arm64/native/sni.dll" />
+    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/win-x64/native/sni.dll" />
+    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/win-x86/native/sni.dll" />
+    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/System.Data.SqlClient.dll" />
+    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/unix/lib/netcoreapp2.1/System.Data.SqlClient.dll" />
+    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/win/lib/netcoreapp2.1/System.Data.SqlClient.dll" />
+    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/System.Runtime.CompilerServices.Unsafe.dll" />
+    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/System.Text.Encoding.CodePages.dll" />
+    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/runtimes/win/lib/netcoreapp2.0/System.Text.Encoding.CodePages.dll" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/dotnet-user-secrets/dotnet-user-secrets.csproj b/src/dotnet-user-secrets/dotnet-user-secrets.csproj
index 74bb54c602..bcb37e37b2 100644
--- a/src/dotnet-user-secrets/dotnet-user-secrets.csproj
+++ b/src/dotnet-user-secrets/dotnet-user-secrets.csproj
@@ -25,4 +25,23 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- sign other aspnet assemblies -->
+    <SignedPackageFile Include="tools/$(TargetFramework)/any/Microsoft.Extensions.Configuration.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="tools/$(TargetFramework)/any/Microsoft.Extensions.Configuration.Abstractions.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="tools/$(TargetFramework)/any/Microsoft.Extensions.Configuration.FileExtensions.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="tools/$(TargetFramework)/any/Microsoft.Extensions.Configuration.Json.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="tools/$(TargetFramework)/any/Microsoft.Extensions.Configuration.UserSecrets.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="tools/$(TargetFramework)/any/Microsoft.Extensions.FileProviders.Abstractions.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="tools/$(TargetFramework)/any/Microsoft.Extensions.FileProviders.Physical.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="tools/$(TargetFramework)/any/Microsoft.Extensions.FileSystemGlobbing.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="tools/$(TargetFramework)/any/Microsoft.Extensions.Primitives.dll" Certificate="$(AssemblySigningCertName)" />
+
+    <!-- 3rd party binary -->
+    <SignedPackageFile Include="tools/$(TargetFramework)/any/Newtonsoft.Json.dll" Certificate="$(AssemblySigningCertName)" />
+
+    <!-- Exclude files that should already be signed by corefx -->
+    <ExcludePackageFileFromSigning Include="tools/$(TargetFramework)/any/System.Runtime.CompilerServices.Unsafe.dll" Certificate="$(AssemblySigningCertName)" />
+  </ItemGroup>
+
 </Project>