From 5810af5ce79eac0f36cda16a2581a9e78dbf67a7 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Fri, 11 Jan 2019 11:27:04 -0800
Subject: [PATCH] Fix code-signing metadata for the SignalR java client (#6607)

---
 eng/targets/Npm.Common.targets                    | 2 +-
 src/SignalR/clients/java/signalr/signalr.javaproj | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets
index 88d4dc59ba..2bbed5f9be 100644
--- a/eng/targets/Npm.Common.targets
+++ b/eng/targets/Npm.Common.targets
@@ -69,7 +69,7 @@
     <Exec Command="npm $(NpmTestArgs)" IgnoreStandardErrorWarningFormat="true" />
   </Target>
 
-  <Target Name="GetArtifactInfo" Condition="'$(IsPackable)' == 'true'">
+  <Target Name="GetArtifactInfo" Condition="'$(IsPackable)' == 'true'" Returns="@(ArtifactInfo)">
     <ItemGroup>
       <ArtifactInfo Include="$(TargetPath)" >
         <ArtifactType>NpmPackage</ArtifactType>
diff --git a/src/SignalR/clients/java/signalr/signalr.javaproj b/src/SignalR/clients/java/signalr/signalr.javaproj
index 97450dd31c..912ef9348b 100644
--- a/src/SignalR/clients/java/signalr/signalr.javaproj
+++ b/src/SignalR/clients/java/signalr/signalr.javaproj
@@ -53,21 +53,20 @@
     <Exec Command="./gradlew $(GradleOptions) test" IgnoreStandardErrorWarningFormat="true" />
   </Target>
 
-  <Target Name="GetArtifactInfo" Condition="'$(IsPackable)' == 'true' ">
+  <Target Name="GetArtifactInfo" Condition="'$(IsPackable)' == 'true' " Returns="@(ArtifactInfo)">
     <ItemGroup>
       <ArtifactInfo Include="$(PackageOutputPath)%(Jars.Identity)">
         <ArtifactType>JavaJar</ArtifactType>
         <Version>$(PackageVersion)</Version>
         <Category>ship</Category>
+        <ShouldBeSigned>true</ShouldBeSigned>
+        <Certificate>$(JarSigningCertName)</Certificate>
       </ArtifactInfo>
       <ArtifactInfo Include="$(PackageOutputPath)%(PomFile.Identity)">
         <ArtifactType>MavenPOM</ArtifactType>
         <Version>$(PackageVersion)</Version>
         <Category>ship</Category>
       </ArtifactInfo>
-
-      <FilesToSign Include="$(PackageOutputPath)%(Jars.Identity)" Certificate="$(JarSigningCertName)" />
-      <FilesToExcludeFromSigning Include="$(PackageOutputPath)%(PomFile.Identity)" />
     </ItemGroup>
   </Target>