From af53b02c13a09068e8c6fa0bc3d259da8b464987 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 11 Apr 2016 11:28:58 -0700 Subject: [PATCH] Fix project.json merge issue --- test/dotnet-publish.Tests/project.json | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 52cf37469..3df76c62b 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -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" }