huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.2'

This commit is contained in:
Nate McMaster 2019-01-11 14:52:01 -08:00
parent 7883eb65a2 5810af5ce7
commit 676cbee9d0
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eng/targets/Npm.Common.targets
View File

@ -69,7 +69,7 @@
<Exec Command="npm $(NpmTestArgs)" IgnoreStandardErrorWarningFormat="true" /> <Exec Command="npm $(NpmTestArgs)" IgnoreStandardErrorWarningFormat="true" />
</Target> </Target>
<Target Name="GetArtifactInfo" Condition="'$(IsPackable)' == 'true'"> <Target Name="GetArtifactInfo" Condition="'$(IsPackable)' == 'true'" Returns="@(ArtifactInfo)">
<ItemGroup> <ItemGroup>
<ArtifactInfo Include="$(TargetPath)" > <ArtifactInfo Include="$(TargetPath)" >
<ArtifactType>NpmPackage</ArtifactType> <ArtifactType>NpmPackage</ArtifactType>

7
src/SignalR/clients/java/signalr/signalr.javaproj
View File

@ -53,21 +53,20 @@
<Exec Command="./gradlew $(GradleOptions) test" IgnoreStandardErrorWarningFormat="true" /> <Exec Command="./gradlew $(GradleOptions) test" IgnoreStandardErrorWarningFormat="true" />
</Target> </Target>
<Target Name="GetArtifactInfo" Condition="'$(IsPackable)' == 'true' "> <Target Name="GetArtifactInfo" Condition="'$(IsPackable)' == 'true' " Returns="@(ArtifactInfo)">
<ItemGroup> <ItemGroup>
<ArtifactInfo Include="$(PackageOutputPath)%(Jars.Identity)"> <ArtifactInfo Include="$(PackageOutputPath)%(Jars.Identity)">
<ArtifactType>JavaJar</ArtifactType> <ArtifactType>JavaJar</ArtifactType>
<Version>$(PackageVersion)</Version> <Version>$(PackageVersion)</Version>
<Category>ship</Category> <Category>ship</Category>
<ShouldBeSigned>true</ShouldBeSigned>
<Certificate>$(JarSigningCertName)</Certificate>
</ArtifactInfo> </ArtifactInfo>
<ArtifactInfo Include="$(PackageOutputPath)%(PomFile.Identity)"> <ArtifactInfo Include="$(PackageOutputPath)%(PomFile.Identity)">
<ArtifactType>MavenPOM</ArtifactType> <ArtifactType>MavenPOM</ArtifactType>
<Version>$(PackageVersion)</Version> <Version>$(PackageVersion)</Version>
<Category>ship</Category> <Category>ship</Category>
</ArtifactInfo> </ArtifactInfo>
<FilesToSign Include="$(PackageOutputPath)%(Jars.Identity)" Certificate="$(JarSigningCertName)" />
<FilesToExcludeFromSigning Include="$(PackageOutputPath)%(PomFile.Identity)" />
</ItemGroup> </ItemGroup>
</Target> </Target>