From a567bb8697bc70f0702c8b437904513425aa5698 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Mon, 11 Apr 2016 18:11:16 -0500 Subject: [PATCH] Fix test project imports to be consistent. - Every project.json needs portable-net451+win8 and dotnet5.4 imports (required by dotnet-test-xunit). - If a test references NuGet, it also needs "netstandardapp1.5", because that the TFM NuGet uses currently. --- test/ArgumentForwardingTests/project.json | 5 ++--- test/ArgumentsReflector/project.json | 7 +------ test/EndToEnd/project.json | 5 ++--- test/Kestrel.Tests/project.json | 5 ++--- test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 4 ++-- test/Microsoft.DotNet.Compiler.Common.Tests/project.json | 5 ++--- test/Microsoft.DotNet.ProjectModel.Tests/project.json | 5 ++--- test/Microsoft.DotNet.Tools.Tests.Utilities/project.json | 5 ++--- .../project.json | 5 ++--- test/ScriptExecutorTests/project.json | 5 ++--- .../project.json | 6 ++---- .../project.json | 6 ++---- test/TestingAbstractions/TestAppWithFullPdbs/project.json | 7 +------ .../TestAppWithPortablePdbs/project.json | 7 +------ test/dotnet-build.Tests/project.json | 3 +-- test/dotnet-compile-fsc.Tests/project.json | 3 +-- test/dotnet-compile.Tests/project.json | 3 +-- test/dotnet-compile.UnitTests/project.json | 2 +- test/dotnet-pack.Tests/project.json | 3 +-- test/dotnet-projectmodel-server.Tests/project.json | 4 ++-- test/dotnet-publish.Tests/project.json | 5 ++--- test/dotnet-resgen.Tests/project.json | 5 ++--- test/dotnet-run.Tests/project.json | 5 ++--- test/dotnet-test.Tests/project.json | 5 ++--- test/dotnet-test.UnitTests/project.json | 4 ++-- test/dotnet.Tests/project.json | 4 ++-- 26 files changed, 44 insertions(+), 79 deletions(-) diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index d199b4697..4b16c13f6 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -24,9 +24,8 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/ArgumentsReflector/project.json b/test/ArgumentsReflector/project.json index 323a45c38..20d4b94f1 100644 --- a/test/ArgumentsReflector/project.json +++ b/test/ArgumentsReflector/project.json @@ -10,12 +10,7 @@ }, }, "frameworks": { - "netcoreapp1.0": { - "imports": [ - "netstandardapp1.5", - "dnxcore50" - ] - } + "netcoreapp1.0": { } }, "content": [ "reflector_cmd.cmd" diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index 63f05dee8..832e50519 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -25,9 +25,8 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/Kestrel.Tests/project.json b/test/Kestrel.Tests/project.json index 4986a3397..641d3523d 100644 --- a/test/Kestrel.Tests/project.json +++ b/test/Kestrel.Tests/project.json @@ -18,9 +18,8 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index c63d4ff68..973350ba5 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -31,8 +31,8 @@ "netcoreapp1.0": { "imports": [ "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index a0dc908cf..d7c1bc0c9 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -21,9 +21,8 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index 0eb615e6e..8b8b3683c 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -21,9 +21,8 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json index 60f22af6a..41b8f7cc2 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -26,9 +26,8 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } } diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index db3af3578..475cda646 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -24,9 +24,8 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index dfbbc6aa0..b77eb08c9 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -20,9 +20,8 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json index b365043d5..e7560b097 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json @@ -25,10 +25,8 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", - "netstandard1.3", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json index 81c2864c7..95c68456d 100644 --- a/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json +++ b/test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json @@ -21,10 +21,8 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", - "netstandard1.3", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/TestingAbstractions/TestAppWithFullPdbs/project.json b/test/TestingAbstractions/TestAppWithFullPdbs/project.json index c3b4d0e25..d43e32b52 100644 --- a/test/TestingAbstractions/TestAppWithFullPdbs/project.json +++ b/test/TestingAbstractions/TestAppWithFullPdbs/project.json @@ -7,11 +7,6 @@ "NETStandard.Library": "1.5.0-rc2-24018" }, "frameworks": { - "netstandard1.5": { - "imports": [ - "portable-net45+win8", - "dnxcore50" - ] - } + "netstandard1.5": { } } } diff --git a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json index 4304f6b6b..3a8321f1d 100644 --- a/test/TestingAbstractions/TestAppWithPortablePdbs/project.json +++ b/test/TestingAbstractions/TestAppWithPortablePdbs/project.json @@ -7,11 +7,6 @@ "NETStandard.Library": "1.5.0-rc2-24018" }, "frameworks": { - "netstandard1.5": { - "imports": [ - "portable-net45+win8", - "dnxcore50" - ] - } + "netstandard1.5": { } } } diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index d43e6e5ac..f118a4301 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -19,8 +19,7 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", + "dotnet5.4", "portable-net451+win8" ] } diff --git a/test/dotnet-compile-fsc.Tests/project.json b/test/dotnet-compile-fsc.Tests/project.json index b9deca2f2..ce841dbf0 100644 --- a/test/dotnet-compile-fsc.Tests/project.json +++ b/test/dotnet-compile-fsc.Tests/project.json @@ -17,8 +17,7 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", + "dotnet5.4", "portable-net451+win8" ] } diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index b481e2837..aac7fad46 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -18,8 +18,7 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", + "dotnet5.4", "portable-net451+win8" ] } diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index 51c96375c..0d350098e 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -33,7 +33,7 @@ "netcoreapp1.0": { "imports": [ "netstandardapp1.5", - "dnxcore50", + "dotnet5.4", "portable-net451+win8" ] } diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index 7163aae20..4b1b98e01 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -19,8 +19,7 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", + "dotnet5.4", "portable-net451+win8" ] } diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index d05af9995..dab7532a2 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -25,8 +25,8 @@ "netcoreapp1.0": { "imports": [ "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 5501f1578..145fdf9f0 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -18,9 +18,8 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index e70addab0..ca995b719 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -19,9 +19,8 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 4986a3397..641d3523d 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -18,9 +18,8 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/dotnet-test.Tests/project.json b/test/dotnet-test.Tests/project.json index ded2ee5c0..6d32bc96d 100644 --- a/test/dotnet-test.Tests/project.json +++ b/test/dotnet-test.Tests/project.json @@ -24,9 +24,8 @@ "frameworks": { "netcoreapp1.0": { "imports": [ - "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 351836583..3c0efceab 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -22,8 +22,8 @@ "netcoreapp1.0": { "imports": [ "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } }, diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index 074d0ca9b..5c368d2a3 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -23,8 +23,8 @@ "netcoreapp1.0": { "imports": [ "netstandardapp1.5", - "dnxcore50", - "portable-net45+win8" + "dotnet5.4", + "portable-net451+win8" ] } },