From 410892051061de8df10121f7d0f3d7b82f24e5e7 Mon Sep 17 00:00:00 2001 From: Livar Cunha Date: Tue, 1 Mar 2016 12:29:09 -0800 Subject: [PATCH] Updating tests to use the latest version of dotnet-test-xunit, which supports debugging from VS. Also updating our xproj files so that we can build the CLI from VS using the CLI. --- .../TestAppWithLibrary/TestLibrary/project.json | 2 +- .../TestLibrary/project.json | 2 +- .../TestLibrary2/project.json | 2 +- .../TestLibraryWithAppDependency/project.json | 2 +- .../Microsoft.DotNet.Cli.Build.Framework.xproj | 2 +- scripts/dotnet-cli-build/TestTargets.cs | 3 ++- scripts/dotnet-cli-build/dotnet-cli-build.xproj | 2 +- .../Microsoft.DotNet.Cli.Utils.xproj | 2 +- .../Microsoft.Dotnet.Compiler.Common.xproj | 2 +- .../Microsoft.DotNet.Files.xproj | 2 +- .../Microsoft.DotNet.InternalAbstractions.xproj | 2 +- .../Microsoft.DotNet.ProjectModel.Loader.xproj | 2 +- .../Microsoft.DotNet.ProjectModel.Workspaces.xproj | 2 +- .../Microsoft.DotNet.ProjectModel.xproj | 2 +- .../Microsoft.DotNet.TestFramework.xproj | 2 +- .../Microsoft.Extensions.DependencyModel.xproj | 2 +- ...Microsoft.Extensions.Testing.Abstractions.xproj | 2 +- src/dotnet/dotnet.xproj | 4 ++-- .../ArgumentForwardingTests.xproj | 2 +- test/ArgumentForwardingTests/project.json | 2 +- test/ArgumentsReflector/Reflector.xproj | 2 +- test/EndToEnd/EndToEnd.xproj | 6 ++++-- test/EndToEnd/project.json | 2 +- .../Microsoft.DotNet.Cli.Utils.Tests.xproj | 2 +- test/Microsoft.DotNet.Cli.Utils.Tests/project.json | 2 +- .../Microsoft.DotNet.Compiler.Common.Tests.xproj | 2 +- .../project.json | 2 +- .../Microsoft.DotNet.ProjectModel.Tests.xproj | 6 ++++-- .../project.json | 2 +- .../Microsoft.DotNet.Tools.Test.Utilities.xproj | 2 +- .../project.json | 3 +-- ...icrosoft.Extensions.DependencyModel.Tests.xproj | 6 ++++-- .../project.json | 2 +- test/ScriptExecutorTests/ScriptExecutorTests.xproj | 2 +- test/ScriptExecutorTests/project.json | 4 ++-- test/dotnet-build.Tests/dotnet-build.Tests.xproj | 6 ++++-- test/dotnet-build.Tests/project.json | 6 +++--- .../dotnet-compile.Tests.xproj | 6 ++++-- test/dotnet-compile.Tests/project.json | 4 ++-- .../dotnet-compile.UnitTests.xproj | 6 ++++-- test/dotnet-compile.UnitTests/project.json | 2 +- test/dotnet-pack.Tests/dotnet-pack.Tests.xproj | 2 +- test/dotnet-pack.Tests/project.json | 2 +- .../dotnet-projectmodel-server.Tests.xproj | 4 ++-- test/dotnet-projectmodel-server.Tests/project.json | 14 +++++++------- .../dotnet-publish.Tests.xproj | 5 ++++- test/dotnet-publish.Tests/project.json | 2 +- test/dotnet-resgen.Tests/dotnet-resgen.Tests.xproj | 2 +- test/dotnet-resgen.Tests/project.json | 2 +- test/dotnet-run.Tests/dotnet-run.Tests.xproj | 2 +- test/dotnet-run.Tests/project.json | 2 +- .../dotnet-test.UnitTests.xproj | 5 ++++- test/dotnet-test.UnitTests/project.json | 2 +- test/dotnet.Tests/dotnet.Tests.xproj | 5 ++++- test/dotnet.Tests/project.json | 6 +++--- .../MultiProjectValidator.xproj | 2 +- 56 files changed, 98 insertions(+), 77 deletions(-) diff --git a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json index 6aaf77a3d..5752b3494 100644 --- a/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json @@ -6,7 +6,7 @@ "additionalArguments": [ "-highentropyva+" ] }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23808" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json index 6aaf77a3d..5752b3494 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json @@ -6,7 +6,7 @@ "additionalArguments": [ "-highentropyva+" ] }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23808" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json index 645f29a2c..ab0c84a05 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json @@ -7,7 +7,7 @@ "dependencies": { "TestLibraryWithAppDependency": { "target":"project", "version":"1.0.0-*" }, - "NETStandard.Library": "1.0.0-rc2-23808" + "NETStandard.Library": "1.0.0-rc2-23811" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json index b63bfedad..6d3f74c0e 100644 --- a/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json +++ b/TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json @@ -3,7 +3,7 @@ "dependencies": { "TestApp": { "target":"project", "version":"1.0.0-*" }, - "NETStandard.Library": "1.0.0-rc2-23808", + "NETStandard.Library": "1.0.0-rc2-23811", }, "frameworks": { diff --git a/scripts/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.xproj b/scripts/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.xproj index 26f7e55e4..d4c58d0e8 100644 --- a/scripts/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.xproj +++ b/scripts/Microsoft.DotNet.Cli.Build.Framework/Microsoft.DotNet.Cli.Build.Framework.xproj @@ -9,7 +9,7 @@ 49beb486-ab5a-4416-91ea-8cd34abb0c9d Microsoft.DotNet.Cli.Build.Framework ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin diff --git a/scripts/dotnet-cli-build/TestTargets.cs b/scripts/dotnet-cli-build/TestTargets.cs index 3ceea87e6..9f842042f 100644 --- a/scripts/dotnet-cli-build/TestTargets.cs +++ b/scripts/dotnet-cli-build/TestTargets.cs @@ -34,7 +34,8 @@ namespace Microsoft.DotNet.Cli.Build "Microsoft.DotNet.Compiler.Common.Tests", "Microsoft.DotNet.ProjectModel.Tests", "Microsoft.Extensions.DependencyModel.Tests", - "ArgumentForwardingTests" + "ArgumentForwardingTests", + "dotnet-test.UnitTests" }; [Target(nameof(PrepareTargets.Init), nameof(SetupTests), nameof(RestoreTests), nameof(BuildTests), nameof(RunTests), nameof(ValidateDependencies))] diff --git a/scripts/dotnet-cli-build/dotnet-cli-build.xproj b/scripts/dotnet-cli-build/dotnet-cli-build.xproj index fadd44933..fd8546624 100644 --- a/scripts/dotnet-cli-build/dotnet-cli-build.xproj +++ b/scripts/dotnet-cli-build/dotnet-cli-build.xproj @@ -9,7 +9,7 @@ d7b9695d-23eb-4ea8-b8ab-707a0092e1d5 Microsoft.DotNet.Cli.Build ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0 diff --git a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.xproj b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.xproj index e86a53369..68df775cf 100644 --- a/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.xproj +++ b/src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.xproj @@ -10,7 +10,7 @@ 61b7c351-c77d-43f7-b56f-bb1440178e10 Microsoft.DotNet.Cli.Utils ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin diff --git a/src/Microsoft.DotNet.Compiler.Common/Microsoft.Dotnet.Compiler.Common.xproj b/src/Microsoft.DotNet.Compiler.Common/Microsoft.Dotnet.Compiler.Common.xproj index 4d04013a6..e7b0225ee 100644 --- a/src/Microsoft.DotNet.Compiler.Common/Microsoft.Dotnet.Compiler.Common.xproj +++ b/src/Microsoft.DotNet.Compiler.Common/Microsoft.Dotnet.Compiler.Common.xproj @@ -10,7 +10,7 @@ a16958e1-24c7-4f1e-b317-204ad91625dd Microsoft.Dotnet.Cli.Compiler.Common ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin diff --git a/src/Microsoft.DotNet.Files/Microsoft.DotNet.Files.xproj b/src/Microsoft.DotNet.Files/Microsoft.DotNet.Files.xproj index 63696bdea..0dca981d4 100644 --- a/src/Microsoft.DotNet.Files/Microsoft.DotNet.Files.xproj +++ b/src/Microsoft.DotNet.Files/Microsoft.DotNet.Files.xproj @@ -9,7 +9,7 @@ d521dd9f-0614-4929-93b4-d8fa5682c174 Microsoft.DotNet.Files ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0 diff --git a/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.xproj b/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.xproj index b898305b0..2f07cc659 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.xproj +++ b/src/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.xproj @@ -9,7 +9,7 @@ bd4f0750-4e81-4ad2-90b5-e470881792c3 Microsoft.DotNet.InternalAbstractions ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0 diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/Microsoft.DotNet.ProjectModel.Loader.xproj b/src/Microsoft.DotNet.ProjectModel.Loader/Microsoft.DotNet.ProjectModel.Loader.xproj index 37f236678..049c639a2 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/Microsoft.DotNet.ProjectModel.Loader.xproj +++ b/src/Microsoft.DotNet.ProjectModel.Loader/Microsoft.DotNet.ProjectModel.Loader.xproj @@ -9,7 +9,7 @@ c7af0290-ef0d-44dc-9edc-600803b664f8 Microsoft.DotNet.ProjectModel.Loader ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/Microsoft.DotNet.ProjectModel.Workspaces.xproj b/src/Microsoft.DotNet.ProjectModel.Workspaces/Microsoft.DotNet.ProjectModel.Workspaces.xproj index 57f445c10..3227dea0a 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/Microsoft.DotNet.ProjectModel.Workspaces.xproj +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/Microsoft.DotNet.ProjectModel.Workspaces.xproj @@ -9,7 +9,7 @@ bd7833f8-3209-4682-bf75-b4bca883e279 Microsoft.DotNet.ProjectModel.Workspaces ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin diff --git a/src/Microsoft.DotNet.ProjectModel/Microsoft.DotNet.ProjectModel.xproj b/src/Microsoft.DotNet.ProjectModel/Microsoft.DotNet.ProjectModel.xproj index 768fb5bf2..c33400887 100644 --- a/src/Microsoft.DotNet.ProjectModel/Microsoft.DotNet.ProjectModel.xproj +++ b/src/Microsoft.DotNet.ProjectModel/Microsoft.DotNet.ProjectModel.xproj @@ -9,7 +9,7 @@ 303677d5-7312-4c3f-baee-beb1a9bd9fe6 Microsoft.DotNet.ProjectModel ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0 diff --git a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.xproj b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.xproj index 3cf0c3871..e6f1e6339 100644 --- a/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.xproj +++ b/src/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.xproj @@ -10,7 +10,7 @@ 0724ed7c-56e3-4604-9970-25e600611383 Microsoft.DotNet.TestFramework ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin diff --git a/src/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.xproj b/src/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.xproj index 8f65b6a1b..8c6e7884f 100644 --- a/src/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.xproj +++ b/src/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.xproj @@ -9,7 +9,7 @@ 688870c8-9843-4f9e-8576-d39290ad0f25 Microsoft.Extensions.DependencyModel ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0 diff --git a/src/Microsoft.Extensions.Testing.Abstractions/Microsoft.Extensions.Testing.Abstractions.xproj b/src/Microsoft.Extensions.Testing.Abstractions/Microsoft.Extensions.Testing.Abstractions.xproj index fa5e79f26..a364b40ec 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/Microsoft.Extensions.Testing.Abstractions.xproj +++ b/src/Microsoft.Extensions.Testing.Abstractions/Microsoft.Extensions.Testing.Abstractions.xproj @@ -9,7 +9,7 @@ dcdfe282-03de-4dbc-b90c-cc3ce3ec8162 Microsoft.Extensions.Testing.Abstractions ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0 diff --git a/src/dotnet/dotnet.xproj b/src/dotnet/dotnet.xproj index c75f071ca..eb07f538d 100644 --- a/src/dotnet/dotnet.xproj +++ b/src/dotnet/dotnet.xproj @@ -8,8 +8,8 @@ 60cf7e6c-d6c8-439d-b7b7-d8a27e29be2c Microsoft.DotNet.Cli - ..\artifacts\obj\$(MSBuildProjectName) - ..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests.xproj b/test/ArgumentForwardingTests/ArgumentForwardingTests.xproj index c3bee218e..5b9cd4886 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests.xproj +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests.xproj @@ -9,7 +9,7 @@ 6973e08d-11ec-49dc-82ef-d5effec7c6e9 Microsoft.DotNet.Tests.ArgumentForwarding ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0 diff --git a/test/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/project.json index 19d7b3954..f79589085 100644 --- a/test/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16" + "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { diff --git a/test/ArgumentsReflector/Reflector.xproj b/test/ArgumentsReflector/Reflector.xproj index 24635bf0b..06cbe2be6 100644 --- a/test/ArgumentsReflector/Reflector.xproj +++ b/test/ArgumentsReflector/Reflector.xproj @@ -9,7 +9,7 @@ 6f2e6f25-b43b-495d-9ca5-7f207d1dd604 Microsoft.DotNet.Tests.ArgumentForwarding ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0 diff --git a/test/EndToEnd/EndToEnd.xproj b/test/EndToEnd/EndToEnd.xproj index 9d4c3826b..cfee5a0ea 100644 --- a/test/EndToEnd/EndToEnd.xproj +++ b/test/EndToEnd/EndToEnd.xproj @@ -9,11 +9,13 @@ 65741cb1-8aee-4c66-8198-10a7ea0e4258 Microsoft.DotNet.Tests.EndToEnd ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin - 2.0 + + + \ No newline at end of file diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index fa2b35eac..a77e796a6 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -13,7 +13,7 @@ "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-*", - "dotnet-test-xunit": "1.0.0-dev-48273-16" + "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.xproj b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.xproj index 5c11f2cd2..e7b914485 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.xproj +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/Microsoft.DotNet.Cli.Utils.Tests.xproj @@ -9,7 +9,7 @@ 09c52f96-efdd-4448-95ec-6d362dd60baa Microsoft.DotNet.Cli.Utils ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0 diff --git a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json index 1d6f97f0b..8a33a570f 100644 --- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json +++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json @@ -13,7 +13,7 @@ "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16" + "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/Microsoft.DotNet.Compiler.Common.Tests.xproj b/test/Microsoft.DotNet.Compiler.Common.Tests/Microsoft.DotNet.Compiler.Common.Tests.xproj index c9004da8c..297d01c2b 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/Microsoft.DotNet.Compiler.Common.Tests.xproj +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/Microsoft.DotNet.Compiler.Common.Tests.xproj @@ -9,7 +9,7 @@ 44e7d1ac-dcf1-4a18-9c22-f09e6bb302b5 Microsoft.DotNet.Cli.Utils ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0 diff --git a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json index 1dd82487c..c747cf74f 100644 --- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json +++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json @@ -9,7 +9,7 @@ "Microsoft.DotNet.Compiler.Common": { "target": "project" }, "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16" + "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/Microsoft.DotNet.ProjectModel.Tests.xproj b/test/Microsoft.DotNet.ProjectModel.Tests/Microsoft.DotNet.ProjectModel.Tests.xproj index d6686a577..f0b4029a5 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/Microsoft.DotNet.ProjectModel.Tests.xproj +++ b/test/Microsoft.DotNet.ProjectModel.Tests/Microsoft.DotNet.ProjectModel.Tests.xproj @@ -9,11 +9,13 @@ 0745410a-6629-47eb-aab5-08d6288cad72 Microsoft.DotNet.ProjectModel.Tests ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin - 2.0 + + + \ No newline at end of file diff --git a/test/Microsoft.DotNet.ProjectModel.Tests/project.json b/test/Microsoft.DotNet.ProjectModel.Tests/project.json index db415b6f5..77177501c 100644 --- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json +++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json @@ -5,7 +5,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16" + "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { "dnxcore50": { diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Test.Utilities.xproj b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Test.Utilities.xproj index a7bd37675..19010ace5 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Test.Utilities.xproj +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Test.Utilities.xproj @@ -10,7 +10,7 @@ e4f46eab-b5a5-4e60-9b9d-40a1fadbf45c Microsoft.DotNet.Tools.Test.Utilities ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json index 95f486f1d..c96146073 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -9,7 +9,7 @@ "System.Collections.Immutable": "1.2.0-rc2-23811", "FluentAssertions": "4.0.0", "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16", + "dotnet-test-xunit": "1.0.0-dev-79755-47", "Microsoft.DotNet.TestFramework": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", @@ -20,7 +20,6 @@ } }, - "frameworks": { "dnxcore50": { "imports": "portable-net45+win8" diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/Microsoft.Extensions.DependencyModel.Tests.xproj b/test/Microsoft.Extensions.DependencyModel.Tests/Microsoft.Extensions.DependencyModel.Tests.xproj index 280b6d48d..f6f7d2856 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/Microsoft.Extensions.DependencyModel.Tests.xproj +++ b/test/Microsoft.Extensions.DependencyModel.Tests/Microsoft.Extensions.DependencyModel.Tests.xproj @@ -9,11 +9,13 @@ 4a4711d8-4312-49fc-87b5-4f183f4c6a51 Microsoft.Extensions.DependencyModel.Tests ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin - 2.0 + + + \ No newline at end of file diff --git a/test/Microsoft.Extensions.DependencyModel.Tests/project.json b/test/Microsoft.Extensions.DependencyModel.Tests/project.json index 1aa2f6ff9..732a5874e 100644 --- a/test/Microsoft.Extensions.DependencyModel.Tests/project.json +++ b/test/Microsoft.Extensions.DependencyModel.Tests/project.json @@ -11,7 +11,7 @@ "FluentAssertions": "4.0.0", "moq.netcore": "4.4.0-beta8", "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16" + "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { diff --git a/test/ScriptExecutorTests/ScriptExecutorTests.xproj b/test/ScriptExecutorTests/ScriptExecutorTests.xproj index 8b66a40d6..e114297b9 100644 --- a/test/ScriptExecutorTests/ScriptExecutorTests.xproj +++ b/test/ScriptExecutorTests/ScriptExecutorTests.xproj @@ -9,7 +9,7 @@ 833ffee1-7eed-4f51-8dfd-946d48833333 Microsoft.DotNet.Cli.Utils.ScriptExecutorTests ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin diff --git a/test/ScriptExecutorTests/project.json b/test/ScriptExecutorTests/project.json index 22bda6b8e..9e55131fb 100644 --- a/test/ScriptExecutorTests/project.json +++ b/test/ScriptExecutorTests/project.json @@ -2,14 +2,14 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.DotNet.ProjectModel": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16" + "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { diff --git a/test/dotnet-build.Tests/dotnet-build.Tests.xproj b/test/dotnet-build.Tests/dotnet-build.Tests.xproj index 86b006c29..b23863bda 100644 --- a/test/dotnet-build.Tests/dotnet-build.Tests.xproj +++ b/test/dotnet-build.Tests/dotnet-build.Tests.xproj @@ -9,11 +9,13 @@ 833ffee1-7eed-4f51-8dfd-946d48833333 Microsoft.DotNet.Tools.Builder.Tests ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin - 2.0 + + + \ No newline at end of file diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index 0629b58b1..ab7e74981 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", - + "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23811", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { @@ -10,7 +10,7 @@ }, "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16" + "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { diff --git a/test/dotnet-compile.Tests/dotnet-compile.Tests.xproj b/test/dotnet-compile.Tests/dotnet-compile.Tests.xproj index d776aa051..109254497 100644 --- a/test/dotnet-compile.Tests/dotnet-compile.Tests.xproj +++ b/test/dotnet-compile.Tests/dotnet-compile.Tests.xproj @@ -9,11 +9,13 @@ 833ffee1-7eed-4f51-8dfd-946d48893d6e Microsoft.DotNet.Tools.Compiler.Tests ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin - 2.0 + + + \ No newline at end of file diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 85fc82774..2338584b6 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -3,14 +3,14 @@ "dependencies": { "NETStandard.Library": "1.0.0-rc2-23811", - + "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" }, "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16" + "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { diff --git a/test/dotnet-compile.UnitTests/dotnet-compile.UnitTests.xproj b/test/dotnet-compile.UnitTests/dotnet-compile.UnitTests.xproj index f2b743757..458f8ad82 100644 --- a/test/dotnet-compile.UnitTests/dotnet-compile.UnitTests.xproj +++ b/test/dotnet-compile.UnitTests/dotnet-compile.UnitTests.xproj @@ -9,11 +9,13 @@ 920b71d8-62da-4f5e-8a26-926c113f1d97 dotnet-compile.UnitTests ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin - 2.0 + + + \ No newline at end of file diff --git a/test/dotnet-compile.UnitTests/project.json b/test/dotnet-compile.UnitTests/project.json index 6f1cc07d6..6ee54d754 100644 --- a/test/dotnet-compile.UnitTests/project.json +++ b/test/dotnet-compile.UnitTests/project.json @@ -12,7 +12,7 @@ "Microsoft.DotNet.ProjectModel": { "target": "project" }, "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16", + "dotnet-test-xunit": "1.0.0-dev-79755-47", "moq.netcore": "4.4.0-beta8", "FluentAssertions": "4.2.2" }, diff --git a/test/dotnet-pack.Tests/dotnet-pack.Tests.xproj b/test/dotnet-pack.Tests/dotnet-pack.Tests.xproj index 961c2bf36..b0d2ba45f 100644 --- a/test/dotnet-pack.Tests/dotnet-pack.Tests.xproj +++ b/test/dotnet-pack.Tests/dotnet-pack.Tests.xproj @@ -9,7 +9,7 @@ 5fda6d37-3a3e-4333-ba5c-f0b28be316f4 dotnet-pack.Tests ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin diff --git a/test/dotnet-pack.Tests/project.json b/test/dotnet-pack.Tests/project.json index ef0d0b593..9df3bae0a 100644 --- a/test/dotnet-pack.Tests/project.json +++ b/test/dotnet-pack.Tests/project.json @@ -11,7 +11,7 @@ }, "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16" + "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { diff --git a/test/dotnet-projectmodel-server.Tests/dotnet-projectmodel-server.Tests.xproj b/test/dotnet-projectmodel-server.Tests/dotnet-projectmodel-server.Tests.xproj index e249a5f52..29f474eb4 100644 --- a/test/dotnet-projectmodel-server.Tests/dotnet-projectmodel-server.Tests.xproj +++ b/test/dotnet-projectmodel-server.Tests/dotnet-projectmodel-server.Tests.xproj @@ -8,8 +8,8 @@ 11c77123-e4da-499f-8900-80c88c2c69f2 Microsoft.DotNet.ProjectModel.Server.Tests - ..\artifacts\obj\$(MSBuildProjectName) - ..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\obj\$(MSBuildProjectName) + ..\..\artifacts\bin 2.0 diff --git a/test/dotnet-projectmodel-server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json index c45e6c868..65d15d9b0 100644 --- a/test/dotnet-projectmodel-server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -1,11 +1,11 @@ { - "dependencies": { - "dotnet": { "target": "project" }, - "Microsoft.DotNet.ProjectModel": { "target": "project" }, - "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, - "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16" - }, + "dependencies": { + "dotnet": { "target": "project" }, + "Microsoft.DotNet.ProjectModel": { "target": "project" }, + "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, + "xunit": "2.1.0", + "dotnet-test-xunit": "1.0.0-dev-79755-47" + }, "frameworks": { "dnxcore50": { "imports": "portable-net45+win8" diff --git a/test/dotnet-publish.Tests/dotnet-publish.Tests.xproj b/test/dotnet-publish.Tests/dotnet-publish.Tests.xproj index 93543daff..5300386c1 100644 --- a/test/dotnet-publish.Tests/dotnet-publish.Tests.xproj +++ b/test/dotnet-publish.Tests/dotnet-publish.Tests.xproj @@ -9,11 +9,14 @@ 386d412c-003c-47b1-8258-0e35865cb7c4 Microsoft.DotNet.Tools.Publish.Tests ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0 + + + \ No newline at end of file diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index a948538a5..ab6058c86 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -12,7 +12,7 @@ "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-*", - "dotnet-test-xunit": "1.0.0-dev-48273-16" + "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { diff --git a/test/dotnet-resgen.Tests/dotnet-resgen.Tests.xproj b/test/dotnet-resgen.Tests/dotnet-resgen.Tests.xproj index 7fdb3e11f..279ade660 100644 --- a/test/dotnet-resgen.Tests/dotnet-resgen.Tests.xproj +++ b/test/dotnet-resgen.Tests/dotnet-resgen.Tests.xproj @@ -9,7 +9,7 @@ 386d412c-003c-47b1-8258-0e35865cb7c4 Microsoft.DotNet.Tools.Resgen.Tests ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0 diff --git a/test/dotnet-resgen.Tests/project.json b/test/dotnet-resgen.Tests/project.json index 47d7afe52..2159b5bf5 100644 --- a/test/dotnet-resgen.Tests/project.json +++ b/test/dotnet-resgen.Tests/project.json @@ -11,7 +11,7 @@ "xunit": "2.1.0", "xunit.netcore.extensions": "1.0.0-prerelease-*", - "dotnet-test-xunit": "1.0.0-dev-48273-16" + "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { diff --git a/test/dotnet-run.Tests/dotnet-run.Tests.xproj b/test/dotnet-run.Tests/dotnet-run.Tests.xproj index 48df0207e..a48fde4f7 100644 --- a/test/dotnet-run.Tests/dotnet-run.Tests.xproj +++ b/test/dotnet-run.Tests/dotnet-run.Tests.xproj @@ -9,7 +9,7 @@ 35e3c2dc-9b38-4ec5-8dd7-c32458dc485f dotnet-run.Tests ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin diff --git a/test/dotnet-run.Tests/project.json b/test/dotnet-run.Tests/project.json index 0629b58b1..3cb3ea7b2 100644 --- a/test/dotnet-run.Tests/project.json +++ b/test/dotnet-run.Tests/project.json @@ -10,7 +10,7 @@ }, "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16" + "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { diff --git a/test/dotnet-test.UnitTests/dotnet-test.UnitTests.xproj b/test/dotnet-test.UnitTests/dotnet-test.UnitTests.xproj index ceb3b9bdd..968a14550 100644 --- a/test/dotnet-test.UnitTests/dotnet-test.UnitTests.xproj +++ b/test/dotnet-test.UnitTests/dotnet-test.UnitTests.xproj @@ -9,10 +9,13 @@ 857274ac-e741-4266-a7fd-14dee0c1cc96 Microsoft.Dotnet.Tools.Test.Tests ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0 + + + \ No newline at end of file diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 1183f75f6..dd42494fd 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -8,7 +8,7 @@ "dotnet": { "target": "project" }, "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16", + "dotnet-test-xunit": "1.0.0-dev-79755-47", "moq.netcore": "4.4.0-beta8", "FluentAssertions": "4.2.2" }, diff --git a/test/dotnet.Tests/dotnet.Tests.xproj b/test/dotnet.Tests/dotnet.Tests.xproj index ce1675088..35608f3d2 100644 --- a/test/dotnet.Tests/dotnet.Tests.xproj +++ b/test/dotnet.Tests/dotnet.Tests.xproj @@ -9,10 +9,13 @@ cb710268-4a82-48e4-9531-faf1c8f78f4b Microsoft.DotNet.Tests ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\bin\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0 + + + \ No newline at end of file diff --git a/test/dotnet.Tests/project.json b/test/dotnet.Tests/project.json index b7ce19b83..325af0130 100644 --- a/test/dotnet.Tests/project.json +++ b/test/dotnet.Tests/project.json @@ -1,8 +1,8 @@ { "version": "1.0.0-*", - + "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23810", + "NETStandard.Library": "1.0.0-rc2-23811", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { @@ -11,7 +11,7 @@ }, "xunit": "2.1.0", - "dotnet-test-xunit": "1.0.0-dev-48273-16" + "dotnet-test-xunit": "1.0.0-dev-79755-47" }, "frameworks": { diff --git a/tools/MultiProjectValidator/MultiProjectValidator.xproj b/tools/MultiProjectValidator/MultiProjectValidator.xproj index c5974d197..27627c2bb 100644 --- a/tools/MultiProjectValidator/MultiProjectValidator.xproj +++ b/tools/MultiProjectValidator/MultiProjectValidator.xproj @@ -9,7 +9,7 @@ 08a68c6a-86f6-4ed2-89a7-b166d33e9f85 ProjectSanity ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\tools\$(MSBuildProjectName)\ + ..\..\artifacts\bin 2.0