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-19 14:54:04 -07:00
parent 1218fa65f8 33ad355114
commit 77cf9711ac
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"type": "platform" "type": "platform"
}, },
"dotnet-test-xunit": "1.0.0-dev-*", "dotnet-test-xunit": "1.0.0-*",
"System.Net.Http": "4.0.1-*", "System.Net.Http": "4.0.1-*",
"System.Runtime.Serialization.Primitives": "4.1.1-*" "System.Runtime.Serialization.Primitives": "4.1.1-*"
}, },

2
test/Microsoft.AspNetCore.Server.KestrelTests/project.json
View File

@ -21,7 +21,7 @@
"System.Net.Http.WinHttpHandler": "4.0.0-*", "System.Net.Http.WinHttpHandler": "4.0.0-*",
"System.Net.Sockets": "4.1.0-*", "System.Net.Sockets": "4.1.0-*",
"System.Runtime.Handles": "4.0.1-*", "System.Runtime.Handles": "4.0.1-*",
"dotnet-test-xunit": "1.0.0-dev-*" "dotnet-test-xunit": "1.0.0-*"
}, },
"imports": [ "imports": [
"dnxcore50", "dnxcore50",