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

Merge branch 'release/2.2'

This commit is contained in:
MikaelMengistu 2018-10-08 11:06:01 -07:00
parent 2a5b42cbe3 813a9e68bc
commit fa51d72185
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -48,7 +48,7 @@ npm install @aspnet/signalr --registry https://dotnet.myget.org/f/aspnetcore-dev
We also have a MsgPack protocol library which is installed via: We also have a MsgPack protocol library which is installed via:
```bash ```bash
npm install @aspnet/signalr-protocol-msgpack npm install @aspnet/signalr-protocol-msgpack
``` ```
## Deploying ## Deploying

10
build/repo.targets
View File

@ -44,7 +44,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="'$(HaveJava)' == 'true' AND '$(SkipJavaClient)' != 'true' "> <Target Name="RunJavaTests" Condition="'$(HasJava)' == 'true' AND '$(SkipJavaClient)' != 'true' ">
<Message Text="Running Java client tests" Importance="high" /> <Message Text="Running Java client tests" Importance="high" />
<Message Text="> gradlew $(GradleOptions) test" Importance="high" /> <Message Text="> gradlew $(GradleOptions) test" Importance="high" />
<Exec Command="./gradlew $(GradleOptions) test" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" IgnoreStandardErrorWarningFormat="true" /> <Exec Command="./gradlew $(GradleOptions) test" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" IgnoreStandardErrorWarningFormat="true" />
@ -76,7 +76,7 @@
</Target> </Target>
<Target Name="GetJavaArtifactInfo"> <Target Name="GetJavaArtifactInfo">
<ItemGroup Condition="'$(SkipJavaClient)' != 'true'"> <ItemGroup Condition="'$(HasJava)' == 'true' AND '$(SkipJavaClient)' != 'true'">
<ArtifactInfo Include="$(BuildDir)\%(Jars.Identity)"> <ArtifactInfo Include="$(BuildDir)\%(Jars.Identity)">
<ArtifactType>JavaJar</ArtifactType> <ArtifactType>JavaJar</ArtifactType>
<Version>$(JavaClientVersion)</Version> <Version>$(JavaClientVersion)</Version>
@ -107,7 +107,7 @@
<!-- The build could still fail if the JDK isn't installed, but we can't reliably detect that without a bunch more code --> <!-- The build could still fail if the JDK isn't installed, but we can't reliably detect that without a bunch more code -->
<PropertyGroup Condition="'$(JavaDetectExitCode)' == '0'"> <PropertyGroup Condition="'$(JavaDetectExitCode)' == '0'">
<HaveJava>true</HaveJava> <HasJava>true</HasJava>
</PropertyGroup> </PropertyGroup>
</Target> </Target>
@ -121,7 +121,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="'$(HaveJava)' == 'true' AND '$(SkipJavaClient)' != 'true' " DependsOnTargets="GetJavaArtifactInfo"> <Target Name="BuildJavaClient" Condition="'$(HasJava)' == 'true' AND '$(SkipJavaClient)' != 'true' " DependsOnTargets="GetJavaArtifactInfo">
<Message Text="Building Java client" Importance="high" /> <Message Text="Building Java client" Importance="high" />
<Message Text="> gradlew $(GradleOptions) compileJava" Importance="high" /> <Message Text="> gradlew $(GradleOptions) compileJava" Importance="high" />
<Exec Command="./gradlew $(GradleOptions) compileJava" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" /> <Exec Command="./gradlew $(GradleOptions) compileJava" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />
@ -146,7 +146,7 @@
<JavaBuildFiles Include="@(Jars);@(PomFile)"/> <JavaBuildFiles Include="@(Jars);@(PomFile)"/>
</ItemGroup> </ItemGroup>
<Target Name="PackJavaClient" Condition="'$(HaveJava)' == 'true' AND '$(SkipJavaClient)' != 'true' "> <Target Name="PackJavaClient" Condition="'$(HasJava)' == 'true' AND '$(SkipJavaClient)' != 'true' ">
<Message Text="Packing Java client" Importance="high" /> <Message Text="Packing Java client" Importance="high" />
<Message Text="> gradlew $(GradleOptions) createPackage" Importance="high" /> <Message Text="> gradlew $(GradleOptions) createPackage" Importance="high" />
<Exec Command="./gradlew $(GradleOptions) createPackage" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" /> <Exec Command="./gradlew $(GradleOptions) createPackage" WorkingDirectory="$(RepositoryRoot)clients/java/signalr" />

2
docs/JSUnitTests.md
View File

@ -66,7 +66,7 @@ Just make sure you remove `.only` when you finish running that test!
You can also use the `-t` parameter to jest. That parameter takes a substring pattern to match against all tests to see if they should run. To improve the speed of the run, you should pair this up with the argument that takes a file path to filter on. For example, given these tests You can also use the `-t` parameter to jest. That parameter takes a substring pattern to match against all tests to see if they should run. To improve the speed of the run, you should pair this up with the argument that takes a file path to filter on. For example, given these tests
``` ```typescript
describe("AbortSignal", () => { describe("AbortSignal", () => {
describe("aborted", () => { describe("aborted", () => {
it("is false on initialization", () => { it("is false on initialization", () => {

6
specs/TransportProtocols.md
View File

@ -22,7 +22,7 @@ The `POST [endpoint-base]/negotiate` request is used to establish a connection b
1. A response that contains the `connectionId` which will be used to identify the connection on the server and the list of the transports supported by the server. 1. A response that contains the `connectionId` which will be used to identify the connection on the server and the list of the transports supported by the server.
``` ```json
{ {
"connectionId":"807809a5-31bf-470d-9e23-afaee35d8a0d", "connectionId":"807809a5-31bf-470d-9e23-afaee35d8a0d",
"availableTransports":[ "availableTransports":[
@ -50,7 +50,7 @@ The `POST [endpoint-base]/negotiate` request is used to establish a connection b
2. A redirect response which tells the client which URL and optionally access token to use as a result. 2. A redirect response which tells the client which URL and optionally access token to use as a result.
``` ```json
{ {
"url": "https://myapp.com/chat", "url": "https://myapp.com/chat",
"accessToken": "accessToken" "accessToken": "accessToken"
@ -65,7 +65,7 @@ The `POST [endpoint-base]/negotiate` request is used to establish a connection b
3. A response that contains an `error` which should stop the connection attempt. 3. A response that contains an `error` which should stop the connection attempt.
``` ```json
{ {
"error": "This connection is not allowed." "error": "This connection is not allowed."
} }