From 89fccf3ac59162ff5c9cdfc1b064ca318c5d446b Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Fri, 28 Sep 2018 10:37:18 -0700
Subject: [PATCH] Enable MicroBuild code signing (#1456)

Fixup the paths to files to be signed.
---
 Directory.Build.props                                         | 3 ---
 build/repo.targets                                            | 3 ---
 .../Microsoft.AspNetCore.Server.IIS.csproj                    | 4 ++--
 .../Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj | 4 ++--
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index a328745f..45a38d3e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -14,9 +14,6 @@
     <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>
     <!-- Workaround microsoft/msbuild#3626 -->
     <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
diff --git a/build/repo.targets b/build/repo.targets
index d8d4d5ab..62c02eab 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -65,9 +65,6 @@
       </ArtifactInfo>
 
       <FilesToSign Include="$(AncmZipOutputPath)" IsContainer="true" />
-
-      <FilesToSign Include="@(Components->'%(BaseOutputPath)/%(Platform)/%(NativeAsset).dll')" Container="$(AncmZipOutputPath)" Certificate="$(AssemblySigningCertName)" />
-
       <FilesToExcludeFromSigning Include="$(StressTestWebSiteZipOutputPath)" />
     </ItemGroup>
   </Target>
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 d82d80f9..22d494a6 100644
--- a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
+++ b/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
@@ -43,9 +43,9 @@
             Pack="true"
             PackagePath="runtimes/win-%(InProcessComponents.Platform)/nativeassets/$(NativeAssetsTargetFramework)" />
 
-      <SignedPackageFile Include="%(InProcessComponents.NativeAsset)_%(InProcessComponents.Platform)"
+      <SignedPackageFile Include="%(InProcessComponents.DllLocation)"
                          PackagePath="runtimes/win-%(InProcessComponents.Platform)/nativeassets/$(NativeAssetsTargetFramework)/%(InProcessComponents.NativeAsset).dll"
-                         Certificate="Microsoft" />
+                         Certificate="$(AssemblySigningCertName)" />
     </ItemGroup>
   </Target>
 
diff --git a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
index d91d5c5a..f0332ef1 100644
--- a/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
+++ b/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj
@@ -41,9 +41,9 @@
             PackageCopyToOutput="true"
             PackagePath="contentFiles/any/any/%(ShimComponents.Platform)/%(ShimComponents.PackageSubPath)"/>
 
-      <SignedPackageFile Include="%(ShimComponents.NativeAsset)_%(ShimComponents.Platform)"
+      <SignedPackageFile Include="%(ShimComponents.DllLocation)"
                          PackagePath="contentFiles/any/any/%(ShimComponents.Platform)/%(ShimComponents.PackageSubPath)%(ShimComponents.NativeAsset).dll"
-                         Certificate="Microsoft" />
+                         Certificate="$(AssemblySigningCertName)" />
 
     </ItemGroup>
   </Target>