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 7ba590b6f1 f12932405d
commit 593b367b3d
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.IISIntegration.Tests/project.json
View File

@ -12,7 +12,7 @@
"dnxcore50" "dnxcore50"
], ],
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-dev-*", "dotnet-test-xunit": "1.0.0-*",
"NETStandard.Library": "1.5.0-*", "NETStandard.Library": "1.5.0-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
} }

2
test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json
View File

@ -11,7 +11,7 @@
"netstandardapp1.5" "netstandardapp1.5"
], ],
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-dev-*", "dotnet-test-xunit": "1.0.0-*",
"System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.Process": "4.1.0-*",
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"type": "platform", "type": "platform",