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

Merge branch 'release/2.1' into dev

This commit is contained in:
David Fowler 2018-03-27 13:29:00 -07:00
parent d598a909a2 bc91191876
commit 113a827c0e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
benchmarks/BenchmarkServer/README.md
View File

@ -12,6 +12,6 @@ The SignalRWorker that runs against this server is located at https://github.com
3. If cloned go to the BenchmarksDriver project
4. Use the following command as a guideline for running a test using your changes
`dotnet run --server <server-endpoint> --client <client-endpoint> --properties "Transport=WebSockets" --properties "HubProtocol=messagepack" -j <path to signalr.json> --repository signalr@branch-name --projectFile benchmarks/BenchmarkServer/BenchmarkServer.csproj`
`benchmarks --server <server-endpoint> --client <client-endpoint> -p TransportType=WebSockets -p HubProtocol=messagepack -j https://raw.githubusercontent.com/aspnet/SignalR/dev/benchmarks/BenchmarkServer/signalr.json`
5. For more info/commands see https://github.com/aspnet/benchmarks/blob/dev/src/BenchmarksDriver/README.md
5. For more info/commands see https://github.com/aspnet/benchmarks/blob/dev/src/BenchmarksDriver/README.md

6
benchmarks/BenchmarkServer/signalr.json
View File

@ -2,9 +2,9 @@
"Default": {
"Client": "SignalR",
"Source": {
"Repository": "https://github.com/aspnet/benchmarks.git",
"Repository": "https://github.com/aspnet/SignalR.git",
"BranchOrCommit": "dev",
"Project": "src/Benchmarks/Benchmarks.csproj"
"Project": "benchmarks/BenchmarkServer/BenchmarkServer.csproj"
},
"Connections": 10,
"Duration": 20,
@ -20,4 +20,4 @@
"SignalREchoAll": {
"ClientProperties": { "Scenario": "echoAll" }
}
}
}