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-26 22:45:18 -07:00
parent a08d314c5d 19de082d26
commit 686783f0f1
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,9 +6,9 @@
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"portable-net451+win8", "portable-dnxcore50+net45+win8+wp8+wpa81",
"dnxcore50", "dotnet",
"netstandardapp1.5" "portable-net45+win8"
], ],
"dependencies": { "dependencies": {
"dotnet-test-xunit": "1.0.0-*", "dotnet-test-xunit": "1.0.0-*",

10
test/TestSites/project.json
View File

@ -18,11 +18,15 @@
"frameworks": { "frameworks": {
"netcoreapp1.0": { "netcoreapp1.0": {
"imports": [ "imports": [
"portable-net451+win8", "portable-dnxcore50+net45+win8+wp8+wpa81",
"dnxcore50" "dotnet",
"portable-net45+win8"
], ],
"dependencies": { "dependencies": {
"Microsoft.NETCore.App": "1.0.0-*", "Microsoft.NETCore.App": {
"version": "1.0.0-*",
"type": "platform"
},
"System.Net.Primitives": "4.0.11-*", "System.Net.Primitives": "4.0.11-*",
"System.Diagnostics.Process": "4.1.0-*" "System.Diagnostics.Process": "4.1.0-*"
} }