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

Merge branch 'release/2.2'

This commit is contained in:
Andrew Stanton-Nurse 2018-08-08 09:29:36 -07:00
parent 556a234c45 b9f6fb97f2
commit d4ac2c528f
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/repo.targets
View File

@ -10,6 +10,14 @@
</NPMPackage> </NPMPackage>
</ItemGroup> </ItemGroup>
<PropertyGroup Condition="'$(JAVA_HOME)' != ''">
<!-- Determine the path we need to search to find javac.exe -->
<JavacPath Condition="'$(OS)' == 'Windows_NT'">$(JAVA_HOME)\bin\javac.exe</JavacPath>
<JavacPath Condition="'$(OS)' != 'Windows_NT'">$(JAVA_HOME)/bin/javac</JavacPath>
<HasJdk Condition="Exists('$(JavacPath)')">true</HasJdk>
</PropertyGroup>
<PropertyGroup> <PropertyGroup>
<RestoreDependsOn>$(RestoreDependsOn);RestoreNpm</RestoreDependsOn> <RestoreDependsOn>$(RestoreDependsOn);RestoreNpm</RestoreDependsOn>
</PropertyGroup> </PropertyGroup>
@ -35,7 +43,7 @@
<Exec Command="npm run test:inner -- --no-color --configuration $(Configuration)" WorkingDirectory="$(RepositoryRoot)clients/ts/FunctionalTests" IgnoreStandardErrorWarningFormat="true" /> <Exec Command="npm run test:inner -- --no-color --configuration $(Configuration)" WorkingDirectory="$(RepositoryRoot)clients/ts/FunctionalTests" IgnoreStandardErrorWarningFormat="true" />
</Target> </Target>
<Target Name="RunJavaTests" Condition="'$(JAVA_HOME)' != '' And Exists('$(JAVA_HOME)/lib/tools.jar')"> <Target Name="RunJavaTests" Condition="'$(HasJdk)' == 'true'">
<Message Text="Running Java client tests" Importance="high" /> <Message Text="Running Java client tests" Importance="high" />
<Exec Command="./gradlew test" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" IgnoreStandardErrorWarningFormat="true" /> <Exec Command="./gradlew test" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" IgnoreStandardErrorWarningFormat="true" />
</Target> </Target>
@ -66,7 +74,7 @@
</ItemGroup> </ItemGroup>
</Target> </Target>
<Target Name="GetJavaArtifactInfo" Condition="'$(JAVA_HOME)' != '' And Exists('$(JAVA_HOME)/lib/tools.jar')"> <Target Name="GetJavaArtifactInfo" Condition="'$(HasJdk)' == 'true'">
<ItemGroup> <ItemGroup>
<ArtifactInfo Include="$(BuildDir)\%(Jars.Identity)"> <ArtifactInfo Include="$(BuildDir)\%(Jars.Identity)">
<ArtifactType>JavaJar</ArtifactType> <ArtifactType>JavaJar</ArtifactType>
@ -96,7 +104,7 @@
<Exec Command="npm run build" WorkingDirectory="$(RepositoryRoot)clients/ts/FunctionalTests" IgnoreStandardErrorWarningFormat="true" /> <Exec Command="npm run build" WorkingDirectory="$(RepositoryRoot)clients/ts/FunctionalTests" IgnoreStandardErrorWarningFormat="true" />
</Target> </Target>
<Target Name="BuildJavaClient" Condition="'$(JAVA_HOME)' != '' And Exists('$(JAVA_HOME)/lib/tools.jar')" DependsOnTargets="GetJavaArtifactInfo"> <Target Name="BuildJavaClient" Condition="'$(HasJdk)' == 'true'" DependsOnTargets="GetJavaArtifactInfo">
<Message Text="Building Java client" Importance="high" /> <Message Text="Building Java client" Importance="high" />
<Exec Command="./gradlew compileJava" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" /> <Exec Command="./gradlew compileJava" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
</Target> </Target>
@ -126,7 +134,7 @@
<PomFile Include="signalr-client-$(JavaClientVersion).pom" /> <PomFile Include="signalr-client-$(JavaClientVersion).pom" />
</ItemGroup> </ItemGroup>
<Target Name="PackJavaClient" Condition="'$(JAVA_HOME)' != '' And Exists('$(JAVA_HOME)/lib/tools.jar')"> <Target Name="PackJavaClient" Condition="'$(HasJdk)' == 'true'">
<Message Text="Packing Java client" Importance="high" /> <Message Text="Packing Java client" Importance="high" />
<Exec Command="./gradlew jar sourceJar javadocJar generatePOM" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" /> <Exec Command="./gradlew jar sourceJar javadocJar generatePOM" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
<Copy SourceFiles="$(RepositoryRoot)clients/java/signalr\build\libs\%(JavaBuildFiles.Identity)" DestinationFolder="$(BuildDir)" /> <Copy SourceFiles="$(RepositoryRoot)clients/java/signalr\build\libs\%(JavaBuildFiles.Identity)" DestinationFolder="$(BuildDir)" />

4
clients/ts/package-lock.json generated
View File

@ -1,9 +1,6 @@
{ {
"name": "client-ts", "name": "client-ts",
"version": "0.0.0", "version": "0.0.0",
<<<<<<< HEAD
"lockfileVersion": 1
=======
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -8952,5 +8949,4 @@
} }
} }
} }
>>>>>>> release/2.1
} }