mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix project.json merge issue

Browse source
This commit is contained in:
Pavel Krymets 2016-04-11 11:28:58 -07:00 • committed by Andrew Stanton-Nurse
parent 14770ae5ba
commit af53b02c13
1 changed files with 7 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
test/dotnet-publish.Tests/project.json
View file

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