From 34054339eddc7c6f640f21e5ae7025a75d0c726c Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 28 Dec 2017 14:10:04 -0800
Subject: [PATCH] Upgrade to build tools 2.1.0-preview1-15651

---
 Directory.Build.props | 1 +
 build/MPack.targets   | 2 ++
 build/VSIX.targets    | 3 +++
 build/repo.props      | 3 +--
 korebuild-lock.txt    | 4 ++--
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 97a9578dec..8ed5874e3d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -16,6 +16,7 @@
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <AssemblySigningCertName>Microsoft</AssemblySigningCertName>
 
     <!-- Generate full pdbs for desktop targeting projects on platforms that support generating full pdbs. -->
     <DebugType Condition="'$(OS)'=='Windows_NT' AND '$(TargetFramework)'=='net46'">full</DebugType>
diff --git a/build/MPack.targets b/build/MPack.targets
index 5c840be107..898af7921b 100644
--- a/build/MPack.targets
+++ b/build/MPack.targets
@@ -29,6 +29,8 @@
         <Version>$(AddinVersion)</Version>
         <Category>$(MPackArtifactCategory)</Category>
       </ArtifactInfo>
+
+      <FilesToExcludeFromSigning Include="$(MPackOutputPath)" />
     </ItemGroup>
   </Target>
 
diff --git a/build/VSIX.targets b/build/VSIX.targets
index 92d9451853..7cd27381f2 100644
--- a/build/VSIX.targets
+++ b/build/VSIX.targets
@@ -34,6 +34,9 @@
         <PackageId>$(VSIXName)</PackageId>
       </ArtifactInfo>
 
+      <FilesToSign Include="$(VSIXOutputPath)" Certificate="Vsix" />
+      <FilesToExcludeFromSigning Include="$(VSIXManifestOutputPath)" />
+
     </ItemGroup>
   </Target>
 
diff --git a/build/repo.props b/build/repo.props
index 8555eb9752..1fa0c150aa 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -12,12 +12,11 @@
     <ExcludeFromTest Include="$(RepositoryRoot)test\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X\Microsoft.AspNetCore.Razor.Test.MvcShim.Version1_X.csproj" />
     <ExcludeSolutions Include="$(RepositoryRoot)Razor.Slim.sln" />
   </ItemGroup>
+
   <PropertyGroup>
     <!-- These properties are use by the automation that updates dependencies.props -->
     <LineupPackageId>Internal.AspNetCore.Universe.Lineup</LineupPackageId>
     <LineupPackageRestoreSource>https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json</LineupPackageRestoreSource>
-
-    <GenerateSignRequest>false</GenerateSignRequest>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 970c6b09ea..7c2e97aa79 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.1.0-preview1-15650
-commithash:f85a36ecd070f8a83675a1464efd6e0fb630199d
+version:2.1.0-preview1-15651
+commithash:ebf2365121c2c6a6a0fbfa9b0f37bb5effc89323