Fix project.json merge issue

This commit is contained in:
Pavel Krymets 2016-04-11 11:28:58 -07:00 committed by Andrew Stanton-Nurse
parent 14770ae5ba
commit af53b02c13

View file

@ -10,26 +10,18 @@
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},
"frameworks": {
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
},
"xunit": "2.1.0",
"xunit.netcore.extensions": "1.0.0-prerelease-00206",
"dotnet-test-xunit": "1.0.0-dev-140469-38"
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"netstandardapp1.5",
"dnxcore50",
"portable-net45+win8"
]
}
"netcoreapp1.0": {
"imports": [
"netstandardapp1.5",
"dnxcore50",
"portable-net45+win8"
]
}
},
"testRunner": "xunit"
}