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-27 17:34:21 -07:00
parent 5a8cba878d 5135ee9d2d
commit 98846a4cc7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json
View File

@ -6,6 +6,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.Server.Kestrel.TestCommon": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel.TestCommon": "1.0.0-*",
"Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*",
"Newtonsoft.Json": "8.0.3",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
@ -20,8 +21,9 @@
"System.Runtime.Serialization.Primitives": "4.1.1-*" "System.Runtime.Serialization.Primitives": "4.1.1-*"
}, },
"imports": [ "imports": [
"dnxcore50", "portable-dnxcore50+net45+win8+wp8+wpa81",
"portable-net451+win8" "dotnet",
"portable-net45+win8"
] ]
}, },
"net451": { "net451": {