From 75ac1a60f70895614ab3fd1f33c49e1860d20667 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 28 Sep 2018 11:22:16 -0700
Subject: [PATCH] Include .jar files in microbuild code signing

---
 Directory.Build.props | 3 ---
 build/repo.targets    | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index d7da0de3c3..5eadbd4ae2 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>
 	  <LangVersion>latest</LangVersion>
   </PropertyGroup>
diff --git a/build/repo.targets b/build/repo.targets
index ffd96ceae7..9db51f6b22 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -48,7 +48,7 @@
     <Message Text="Running Java client tests" Importance="high" />
     <Message Text="> gradlew $(GradleOptions) test" Importance="high" />
     <Exec Command="./gradlew $(GradleOptions) test" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" IgnoreStandardErrorWarningFormat="true" />
-  </Target> 
+  </Target>
 
   <PropertyGroup>
     <GetArtifactInfoDependsOn>$(GetArtifactInfoDependsOn);GetNpmArtifactInfo;GetJavaArtifactInfo</GetArtifactInfoDependsOn>
@@ -88,7 +88,7 @@
         <Category>ship</Category>
       </ArtifactInfo>
 
-      <FilesToExcludeFromSigning Include="$(BuildDir)\%(Jars.Identity)" />
+      <FilesToSign Include="$(BuildDir)\%(Jars.Identity)" Certificate="MicrosoftJAR" />
       <FilesToExcludeFromSigning Include="$(BuildDir)\%(PomFile.Identity)" />
     </ItemGroup>
   </Target>