From 79d098045b882ea2e69ea597b5780e5f698d3df4 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Mon, 22 Oct 2018 09:32:07 -0700
Subject: [PATCH] Code-sign the Microsoft.AspNetCore.AspNetCoreModule{V2}
 packages

---
 build/repo.props   |  1 -
 build/repo.targets | 17 ++++++++++++-----
 korebuild-lock.txt |  4 ++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/build/repo.props b/build/repo.props
index fd4d80cb7a..15cb7e1a13 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -2,7 +2,6 @@
   <Import Project="dependencies.props" />
 
   <PropertyGroup>
-    <AssemblySigningCertName>Microsoft400</AssemblySigningCertName>
     <AncmZipOutputPath>$(BuildDir)AspNetCoreModule.zip</AncmZipOutputPath>
     <StressTestWebSiteZipOutputPath>$(BuildDir)StressTestWebSite.zip</StressTestWebSiteZipOutputPath>
   </PropertyGroup>
diff --git a/build/repo.targets b/build/repo.targets
index 5b63ccb152..cb7c994ac7 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -35,22 +35,29 @@
   </Target>
 
   <Target Name="GetNativeArtifactsInfo">
+    <PropertyGroup>
+      <AncmPackageOutputPath>$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg</AncmPackageOutputPath>
+      <AncmV2PackageOutputPath>$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg</AncmV2PackageOutputPath>
+    </PropertyGroup>
+
     <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
-      <ArtifactInfo Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg">
+      <ArtifactInfo Include="$(AncmPackageOutputPath)">
         <ArtifactType>NuGetPackage</ArtifactType>
         <PackageId>Microsoft.AspNetCore.AspNetCoreModule</PackageId>
         <Version>$(PackageVersion)</Version>
         <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
       </ArtifactInfo>
-      <FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg" />
+      <FilesToSign Include="$(AncmPackageOutputPath)" Certificate="$(PackageSigningCertName)" />
+      <FilesToSign Include="$(RepositoryRoot)tools\installancm.ps1" Container="$(AncmPackageOutputPath)" Certificate="$(PowerShellSigningCertName)" />
 
-      <ArtifactInfo Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg">
+      <ArtifactInfo Include="$(AncmV2PackageOutputPath)">
         <ArtifactType>NuGetPackage</ArtifactType>
         <PackageId>Microsoft.AspNetCore.AspNetCoreModuleV2</PackageId>
         <Version>$(PackageVersion)</Version>
         <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
       </ArtifactInfo>
-      <FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg" />
+      <FilesToSign Include="$(AncmV2PackageOutputPath)" Certificate="$(PackageSigningCertName)" />
+      <FilesToSign Include="$(RepositoryRoot)tools\installancm.ps1" Container="$(AncmV2PackageOutputPath)" Certificate="$(PowerShellSigningCertName)" />
 
       <ArtifactInfo Include="$(AncmZipOutputPath)">
         <ArtifactType>ZipArchive</ArtifactType>
@@ -66,7 +73,7 @@
 
       <FilesToSign Include="$(AncmZipOutputPath)" Certificate="None" IsContainer="true" />
       <FilesToExcludeFromSigning Include="$(StressTestWebSiteZipOutputPath)" />
-      <FilesToExcludeFromSigning Include="AspNetCore\ancm.mof" Container="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg" />
+      <FilesToExcludeFromSigning Include="AspNetCore\ancm.mof" Container="$(AncmV2PackageOutputPath)" />
     </ItemGroup>
   </Target>
 
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index e3cc145b03..0055dcb41f 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.2.0-preview2-20181016.3
-commithash:17ee7986dbe75408d9e4efd94eab1003adcc3ad7
+version:2.2.0-preview2-20181019.5
+commithash:84a1c04b13bd7127728fee91989db8f2f58c8781