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-05-03 19:24:33 -07:00
parent a43acb2fee 039bb6e714
commit 0beff6f91a
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/project.json
View File

@ -21,6 +21,7 @@
"Microsoft.AspNetCore.Server.Testing": "1.0.0-*", "Microsoft.AspNetCore.Server.Testing": "1.0.0-*",
"Microsoft.Extensions.Logging": "1.0.0-*", "Microsoft.Extensions.Logging": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {

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

@ -4,6 +4,7 @@
"dotnet-test-xunit": "1.0.0-*", "dotnet-test-xunit": "1.0.0-*",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
"Microsoft.AspNetCore.TestHost": "1.0.0-*", "Microsoft.AspNetCore.TestHost": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.1-*",
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
@ -20,11 +21,7 @@
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
} }
}, },
"net451": { "net451": {}
"dependencies": {
"xunit.runner.console": "2.1.0"
}
}
}, },
"testRunner": "xunit" "testRunner": "xunit"
} }

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

@ -2,7 +2,7 @@
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*", "dotnet-test-xunit": "1.0.0-*",
"xunit": "2.1.0", "xunit": "2.1.0",
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*" "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*",
}, },
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {