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

---
 Directory.Build.props                         |  1 +
 korebuild-lock.txt                            |  4 ++--
 .../Microsoft.AspNetCore.Razor.Design.csproj  | 22 +++++++++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 8260b6f326..71517b7fe5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -14,6 +14,7 @@
     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
+    <PackageSigningCertName>MicrosoftNuGet</PackageSigningCertName>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AssemblySigningCertName>Microsoft</AssemblySigningCertName>
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/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj b/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj
index e90541fe97..2e248645a5 100644
--- a/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj
+++ b/src/Microsoft.AspNetCore.Razor.Design/Microsoft.AspNetCore.Razor.Design.csproj
@@ -11,9 +11,9 @@
     <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
   </PropertyGroup>
 
-  <!-- 
+  <!--
     Building this package is somewhat complicated because we need to Build or Publish some other projects
-    that have different TFM's including one with multiple TFMs. 
+    that have different TFM's including one with multiple TFMs.
 
     We then need to include the output of those projects in our output directory (where it will be used
     by tests) and in the nukpg.
@@ -30,6 +30,24 @@
     <ProjectReference Include="$(ToolProject)" ReferenceOutputAssembly="false" Condition="'$(TargetFramework)' == 'netcoreapp2.0'" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'==''">
+    <!-- Binaries produced in this project -->
+    <SignedPackageFile Include="tools/rzc.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="tasks/net46/Microsoft.AspNetCore.Razor.Tasks.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="tasks/netstandard2.0/Microsoft.AspNetCore.Razor.Tasks.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="tools/Microsoft.AspNetCore.Razor.Language.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="tools/Microsoft.CodeAnalysis.Razor.dll" Certificate="$(AssemblySigningCertName)" />
+
+    <!-- Third-party assemblies -->
+    <SignedPackageFile Include="tools/Newtonsoft.Json.dll" Certificate="3PartyDual" />
+
+    <!-- Binaries that should be signed by corefx/roslyn -->
+    <ExcludePackageFileFromSigning Include="tools/Microsoft.CodeAnalysis.CSharp.dll" />
+    <ExcludePackageFileFromSigning Include="tools/Microsoft.CodeAnalysis.dll" />
+    <ExcludePackageFileFromSigning Include="tools/runtimes/unix/lib/netstandard1.3/System.Text.Encoding.CodePages.dll" />
+    <ExcludePackageFileFromSigning Include="tools/runtimes/win/lib/netstandard1.3/System.Text.Encoding.CodePages.dll" />
+  </ItemGroup>
+
   <Target Name="PopulateNuspec" BeforeTargets="GenerateNuspec">
 
     <PropertyGroup>