Merge branch 'release/2.2'

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>

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>