From 5ebf74fa328ed0de04637982456e54e2e1764f3b Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Wed, 6 Jun 2018 08:55:18 -0700
Subject: [PATCH] Add certificate names for code signing (#889)

---
 Directory.Build.props                         |  4 +-
 build/repo.targets                            | 49 ++++++++++---------
 korebuild-lock.txt                            |  4 +-
 .../Microsoft.AspNetCore.Server.IIS.csproj    |  5 +-
 .../Microsoft.AspNetCore.Server.IIS.nuspec    | 32 ------------
 5 files changed, 32 insertions(+), 62 deletions(-)
 delete mode 100644 src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec

diff --git a/Directory.Build.props b/Directory.Build.props
index 46a1159f78..f015ba2785 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <Import
     Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.props))\AspNetCoreSettings.props"
     Condition=" '$(CI)' != 'true' AND '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), AspNetCoreSettings.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/build/repo.targets b/build/repo.targets
index a70e25df5f..c5c7cfd50e 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <PrepareDependsOn>InitializeComponents;$(PrepareDependsOn)</PrepareDependsOn>
+    <GetArtifactInfoDependsOn>$(GetArtifactInfoDependsOn);GetNativeArtifactsInfo</GetArtifactInfoDependsOn>
     <CompileDependsOn Condition="'$(OS)'=='Windows_NT'">BuildNativeAssets;$(CompileDependsOn)</CompileDependsOn>
     <PackageDependsOn Condition="'$(OS)'=='Windows_NT'">$(PackageDependsOn);PackageNativeProjects</PackageDependsOn>
     <TestDependsOn>$(TestDependsOn);RunNativeTest</TestDependsOn>
@@ -61,33 +62,35 @@
       Condition="'$(VisualStudioMSBuildx86Path)' != ''" />
   </Target>
 
-  <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <ArtifactInfo Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg">
-      <ArtifactType>NuGetPackage</ArtifactType>
-      <PackageId>Microsoft.AspNetCore.AspNetCoreModule</PackageId>
-      <Version>$(PackageVersion)</Version>
-      <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
-    </ArtifactInfo>
-    <FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg" />
+  <Target Name="GetNativeArtifactsInfo" DependsOnTargets="InitializeComponents">
+    <ItemGroup Condition=" '$(OS)' == 'Windows_NT' ">
+      <ArtifactInfo Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg">
+        <ArtifactType>NuGetPackage</ArtifactType>
+        <PackageId>Microsoft.AspNetCore.AspNetCoreModule</PackageId>
+        <Version>$(PackageVersion)</Version>
+        <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
+      </ArtifactInfo>
+      <FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModule.$(PackageVersion).nupkg" />
 
-    <ArtifactInfo Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg">
-      <ArtifactType>NuGetPackage</ArtifactType>
-      <PackageId>Microsoft.AspNetCore.AspNetCoreModuleV2</PackageId>
-      <Version>$(PackageVersion)</Version>
-      <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
-    </ArtifactInfo>
-    <FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg" />
+      <ArtifactInfo Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg">
+        <ArtifactType>NuGetPackage</ArtifactType>
+        <PackageId>Microsoft.AspNetCore.AspNetCoreModuleV2</PackageId>
+        <Version>$(PackageVersion)</Version>
+        <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
+      </ArtifactInfo>
+      <FilesToExcludeFromSigning Include="$(BuildDir)Microsoft.AspNetCore.AspNetCoreModuleV2.$(PackageVersion).nupkg" />
 
-    <ArtifactInfo Include="$(AncmZipOutputPath)">
-      <ArtifactType>ZipArchive</ArtifactType>
-      <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
-      <Category>shipoob</Category>
-    </ArtifactInfo>
+      <ArtifactInfo Include="$(AncmZipOutputPath)">
+        <ArtifactType>ZipArchive</ArtifactType>
+        <RepositoryRoot>$(RepositoryRoot)</RepositoryRoot>
+        <Category>shipoob</Category>
+      </ArtifactInfo>
 
-    <FilesToSign Include="$(AncmZipOutputPath)" IsContainer="true" />
+      <FilesToSign Include="$(AncmZipOutputPath)" IsContainer="true" />
 
-    <FilesToSign Include="%(Components.BaseOutputPath)/%(Components.Platform)/%(Components.NativeAsset).dll" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
-  </ItemGroup>
+      <FilesToSign Include="@(Components->'%(BaseOutputPath)/%(Platform)/%(NativeAsset).dll')" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
+    </ItemGroup>
+  </Target>
 
   <Target Name="PackageNativeProjects">
     <PackNuspec NuspecPath="$(MSBuildThisFileDirectory)..\nuget\AspNetCoreV1.nuspec"
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.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
index b792bfbb62..f45796256a 100644
--- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
+++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
@@ -23,14 +23,11 @@
     <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(MicrosoftAspNetCoreHostingAbstractionsPackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup>
-    <SignedPackageFile Include="$(TargetPath)" PackagePath="lib/netstandard2.0/Microsoft.AspNetCore.Server.IIS.dll" Certificate="Microsoft" />
-  </ItemGroup>
-
   <ItemGroup Condition="$(PackNativeAssets) == 'true'">
     <SignedPackageFile Include="aspnetcorev2_inprocess_x86" PackagePath="runtimes/win-x86/nativeassets/$(TargetFramework)/aspnetcorev2_inprocess.dll" Certificate="Microsoft" />
     <SignedPackageFile Include="aspnetcorev2_inprocess_x64" PackagePath="runtimes/win-x64/nativeassets/$(TargetFramework)/aspnetcorev2_inprocess.dll" Certificate="Microsoft" />
 
+    <Content Include="$(PackageId).targets" PackagePath="build/$(TargetFramework)/" />
     <Content Include="..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\Win32\aspnetcorev2_inprocess.dll" PackagePath="runtimes/win-x86/nativeassets/$(TargetFramework)/aspnetcorev2_inprocess.dll" />
     <Content Include="..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$(Configuration)\x64\aspnetcorev2_inprocess.dll" PackagePath="runtimes/win-x64/nativeassets/$(TargetFramework)/aspnetcorev2_inprocess.dll" />
   </ItemGroup>
diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec
deleted file mode 100644
index 8e6ff9c302..0000000000
--- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
-  <metadata>
-    <id>Microsoft.AspNetCore.Server.IIS</id>
-    <version>$version$</version>
-    <authors>$author$</authors>
-    <licenseUrl>$licenseUrl$</licenseUrl>
-    <copyright>$copyright$</copyright>
-    <projectUrl>$projectUrl$</projectUrl>
-    <iconUrl>$iconUrl$</iconUrl>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <description>$description$</description>
-    <language>en-US</language>
-    <tags>aspnetcore iis</tags>
-    <serviceable>$serviceable$</serviceable>
-    <repository type="$repositoryType$" url="$repositoryUrl$" commit="$repositoryCommit$" />
-    <dependencies>
-      <group targetFramework="$tfmGroup$">
-        <dependency id="Microsoft.AspNetCore.Server.IISIntegration" version="[$version$ , )" />
-      </group>
-    </dependencies>
-  </metadata>
-  <files>
-    <!-- The _._ placeholder file will instruct NuGet to treat this package as only being compatible with $tfm$ -->
-    <file src="_._" target="lib/$tfm$/" />
-
-    <file src="Microsoft.AspNetCore.Server.IIS.targets" target="build/$tfm$/Microsoft.AspNetCore.Server.IIS.targets" />
-
-    <file src="..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$Configuration$\Win32\aspnetcorev2_inprocess.dll" target="runtimes\win-x86\nativeassets\$tfm$\aspnetcorev2_inprocess.dll" />
-    <file src="..\AspNetCoreModuleV2\InProcessRequestHandler\bin\$Configuration$\x64\aspnetcorev2_inprocess.dll" target="runtimes\win-x64\nativeassets\$tfm$\aspnetcorev2_inprocess.dll" />
-  </files>
-</package>