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

Merge branch 'release' into dev

This commit is contained in:
Cesar Blum Silveira 2015-11-03 13:10:01 -08:00
parent 5f91ce2f2b 7770e5f4db
commit 2ffa50a80b
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Microsoft.AspNet.WebSockets.Client/project.json
View File

@ -6,7 +6,8 @@
"url": "git://github.com/aspnet/websockets" "url": "git://github.com/aspnet/websockets"
}, },
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
}, },
"dependencies": { "dependencies": {
"Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*" "Microsoft.AspNet.WebSockets.Protocol": "1.0.0-*"

3
src/Microsoft.AspNet.WebSockets.Protocol/project.json
View File

@ -6,7 +6,8 @@
"url": "git://github.com/aspnet/websockets" "url": "git://github.com/aspnet/websockets"
}, },
"compilationOptions": { "compilationOptions": {
"warningsAsErrors": true "warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},

4
src/Microsoft.AspNet.WebSockets.Server/project.json
View File

@ -1,5 +1,9 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
},
"description": "ASP.NET 5 web socket middleware for use on top of opaque servers.", "description": "ASP.NET 5 web socket middleware for use on top of opaque servers.",
"repository": { "repository": {
"type": "git", "type": "git",

BIN
tools/Key.snk Normal file
View File

Binary file not shown.