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

Merge branch 'release' into dev

This commit is contained in:
Pranav K 2016-04-08 06:49:22 -07:00
parent 4316282a3f e06a0f0898
commit 730a23e5ca
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Microsoft.AspNetCore.WebSockets.Protocol/project.json
View File

@ -30,10 +30,7 @@
"System.Threading": "4.0.11-*", "System.Threading": "4.0.11-*",
"System.Threading.Tasks": "4.0.11-*", "System.Threading.Tasks": "4.0.11-*",
"System.Threading.Timer": "4.0.1-*" "System.Threading.Timer": "4.0.1-*"
}, }
"imports": [
"dotnet5.4"
]
} }
} }
} }

5
src/Microsoft.AspNetCore.WebSockets.Server/project.json
View File

@ -21,10 +21,7 @@
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"netstandard1.3": { "netstandard1.3": {
"dependencies": {}, "dependencies": {}
"imports": [
"dotnet5.4"
]
} }
} }
} }