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

Merge branch 'release' into dev

This commit is contained in:
Pavel Krymets 2016-04-18 17:09:15 -07:00
parent fffde66627 4ee4c29b06
commit b5d7ebd22d
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/AutobahnTestClient/project.json
View File

@ -3,6 +3,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.WebSockets.Client": "0.1.0-*" "Microsoft.AspNetCore.WebSockets.Client": "0.1.0-*"
}, },
"frameworks": { "frameworks": {

1
test/AutobahnTestServer/project.json
View File

@ -1,6 +1,7 @@
{ {
"exclude": "wwwroot/**/*", "exclude": "wwwroot/**/*",
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.WebSockets.Server": "0.1.0-*", "Microsoft.AspNetCore.WebSockets.Server": "0.1.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
}, },

4
test/Microsoft.AspNetCore.WebSockets.Client.Test/project.json
View File

@ -1,5 +1,6 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.WebSockets.Client": "0.1.0-*", "Microsoft.AspNetCore.WebSockets.Client": "0.1.0-*",
"Microsoft.AspNetCore.WebSockets.Server": "0.1.0-*", "Microsoft.AspNetCore.WebSockets.Server": "0.1.0-*",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@ -11,5 +12,4 @@
"frameworks": { "frameworks": {
"net451": {} "net451": {}
} }
} }

1
test/Microsoft.AspNetCore.WebSockets.Protocol.Test/project.json
View File

@ -1,5 +1,6 @@
{ {
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-*",
"Microsoft.AspNetCore.WebSockets.Protocol": "0.1.0-*", "Microsoft.AspNetCore.WebSockets.Protocol": "0.1.0-*",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },