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

---
 Directory.Build.props                                      | 2 ++
 korebuild-lock.txt                                         | 4 ++--
 .../Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj  | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 64f6af34d3..c7003b9eea 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -14,6 +14,8 @@
     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
+    <AssemblySigningCertName>Microsoft</AssemblySigningCertName>
+    <PackageSigningCertName>MicrosoftNuGet</PackageSigningCertName>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 06ba6285b7..b679b80427 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.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj
index 6e855a8ed3..b9453e0891 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj
@@ -22,6 +22,13 @@
     <PackageReference Update="Microsoft.NETCore.App" PrivateAssets="All" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == ''">
+    <SignedPackageFile Include="build/netstandard2.0/netcoreapp2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.dll" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="build/netstandard2.0/net461/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation-x86.exe" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="build/netstandard2.0/net461/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.exe" Certificate="$(AssemblySigningCertName)" />
+    <SignedPackageFile Include="build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.dll" Certificate="$(AssemblySigningCertName)" />
+  </ItemGroup>
+
   <Target Name="BuildX86" AfterTargets="Build" Condition="'$(TargetFramework)'=='net461' AND '$(PlatformTarget)'!='x86'">
     <MSBuild
       Projects="$(MSBuildProjectFullPath)"