diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index 236afa7fb..770834c0c 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.25123.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}" EndProject @@ -246,22 +246,6 @@ Global {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.Debug|Any CPU.Build.0 = Debug|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.Debug|x64.ActiveCfg = Debug|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.Debug|x64.Build.0 = Debug|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.Release|Any CPU.ActiveCfg = Release|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.Release|Any CPU.Build.0 = Release|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.Release|x64.ActiveCfg = Release|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.Release|x64.Build.0 = Release|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {688870C8-9843-4F9E-8576-D39290AD0F25}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {65741CB1-8AEE-4C66-8198-10A7EA0E4258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {65741CB1-8AEE-4C66-8198-10A7EA0E4258}.Debug|Any CPU.Build.0 = Debug|Any CPU {65741CB1-8AEE-4C66-8198-10A7EA0E4258}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -854,39 +838,22 @@ Global {E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Debug|x64.ActiveCfg = Debug|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Debug|x64.Build.0 = Debug|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Release|Any CPU.Build.0 = Release|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Release|x64.ActiveCfg = Release|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.Release|x64.Build.0 = Release|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|x64.ActiveCfg = Debug|x64 - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|x64.Build.0 = Debug|x64 - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|Any CPU.ActiveCfg = MinSizeRel|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|Any CPU.Build.0 = MinSizeRel|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|x64.ActiveCfg = MinSizeRel|x64 - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|x64.Build.0 = MinSizeRel|x64 + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|x64.ActiveCfg = Debug|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Debug|x64.Build.0 = Debug|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|x64.ActiveCfg = Release|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.MinSizeRel|x64.Build.0 = Release|Any CPU {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|Any CPU.ActiveCfg = Release|Any CPU {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|Any CPU.Build.0 = Release|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|x64.ActiveCfg = Release|x64 - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|x64.Build.0 = Release|x64 - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|Any CPU.ActiveCfg = RelWithDebInfo|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|Any CPU.Build.0 = RelWithDebInfo|Any CPU - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 - {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|x64.ActiveCfg = Release|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.Release|x64.Build.0 = Release|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {6D028154-5518-4A56-BAD6-938A90E5BCF6}.RelWithDebInfo|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -897,7 +864,6 @@ Global {A16958E1-24C7-4F1E-B317-204AD91625DD} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {BD7833F8-3209-4682-BF75-B4BCA883E279} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {688870C8-9843-4F9E-8576-D39290AD0F25} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {65741CB1-8AEE-4C66-8198-10A7EA0E4258} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {713CBFBB-5392-438D-B766-A9A585EF1BB8} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} @@ -944,7 +910,6 @@ Global {FF498306-2DE2-47F6-8C35-3CF0589CF2B8} = {89905EC4-BC0F-443B-8ADF-691321F10108} {E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {27B12960-ABB0-4903-9C60-5E9157E659C8} = {89905EC4-BC0F-443B-8ADF-691321F10108} - {EDD6C92D-0A58-4FCB-A0E9-9D0FFC045177} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {6D028154-5518-4A56-BAD6-938A90E5BCF6} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} EndGlobalSection EndGlobal diff --git a/build/package/Microsoft.DotNet.Cli.Nupkg.targets b/build/package/Microsoft.DotNet.Cli.Nupkg.targets index 08d0ae9dc..adf734121 100644 --- a/build/package/Microsoft.DotNet.Cli.Nupkg.targets +++ b/build/package/Microsoft.DotNet.Cli.Nupkg.targets @@ -43,8 +43,8 @@ Microsoft.Extensions.Testing.Abstractions $(SdkNugetVersion) - - dotnet-test-console + + Microsoft.DotNet.Tools.Test $(SdkNugetVersion) diff --git a/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs b/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs index 44cb99526..a062d0c47 100644 --- a/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs +++ b/src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs @@ -9,4 +9,4 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.DotNet.Configurer.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] [assembly: InternalsVisibleTo("dotnet-test.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100039ac461fa5c82c7dd2557400c4fd4e9dcdf7ac47e3d572548c04cd4673e004916610f4ea5cbf86f2b1ca1cb824f2a7b3976afecfcf4eb72d9a899aa6786effa10c30399e6580ed848231fec48374e41b3acf8811931343fc2f73acf72dae745adbcb7063cc4b50550618383202875223fc75401351cd89c44bf9b50e7fa3796")] -[assembly: InternalsVisibleTo("dotnet-test-console, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +[assembly: InternalsVisibleTo("Microsoft.DotNet.Tools.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/dotnet-test-console/AssemblyTestRunner.cs b/src/Microsoft.DotNet.Tools.Test/AssemblyTestRunner.cs similarity index 100% rename from src/dotnet-test-console/AssemblyTestRunner.cs rename to src/Microsoft.DotNet.Tools.Test/AssemblyTestRunner.cs diff --git a/src/dotnet-test-console/AssemblyUnderTest.cs b/src/Microsoft.DotNet.Tools.Test/AssemblyUnderTest.cs similarity index 100% rename from src/dotnet-test-console/AssemblyUnderTest.cs rename to src/Microsoft.DotNet.Tools.Test/AssemblyUnderTest.cs diff --git a/src/dotnet-test-console/CommandTestRunnerExtensions.cs b/src/Microsoft.DotNet.Tools.Test/CommandTestRunnerExtensions.cs similarity index 100% rename from src/dotnet-test-console/CommandTestRunnerExtensions.cs rename to src/Microsoft.DotNet.Tools.Test/CommandTestRunnerExtensions.cs diff --git a/src/dotnet-test-console/ConsoleTestRunner.cs b/src/Microsoft.DotNet.Tools.Test/ConsoleTestRunner.cs similarity index 100% rename from src/dotnet-test-console/ConsoleTestRunner.cs rename to src/Microsoft.DotNet.Tools.Test/ConsoleTestRunner.cs diff --git a/src/dotnet-test-console/DesignTimeRunner.cs b/src/Microsoft.DotNet.Tools.Test/DesignTimeRunner.cs similarity index 100% rename from src/dotnet-test-console/DesignTimeRunner.cs rename to src/Microsoft.DotNet.Tools.Test/DesignTimeRunner.cs diff --git a/src/dotnet-test-console/DotnetTest.cs b/src/Microsoft.DotNet.Tools.Test/DotnetTest.cs similarity index 100% rename from src/dotnet-test-console/DotnetTest.cs rename to src/Microsoft.DotNet.Tools.Test/DotnetTest.cs diff --git a/src/dotnet-test-console/DotnetTestExtensions.cs b/src/Microsoft.DotNet.Tools.Test/DotnetTestExtensions.cs similarity index 100% rename from src/dotnet-test-console/DotnetTestExtensions.cs rename to src/Microsoft.DotNet.Tools.Test/DotnetTestExtensions.cs diff --git a/src/dotnet-test-console/DotnetTestParams.cs b/src/Microsoft.DotNet.Tools.Test/DotnetTestParams.cs similarity index 100% rename from src/dotnet-test-console/DotnetTestParams.cs rename to src/Microsoft.DotNet.Tools.Test/DotnetTestParams.cs diff --git a/src/dotnet-test-console/DotnetTestRunnerFactory.cs b/src/Microsoft.DotNet.Tools.Test/DotnetTestRunnerFactory.cs similarity index 100% rename from src/dotnet-test-console/DotnetTestRunnerFactory.cs rename to src/Microsoft.DotNet.Tools.Test/DotnetTestRunnerFactory.cs diff --git a/src/dotnet-test-console/DotnetTestState.cs b/src/Microsoft.DotNet.Tools.Test/DotnetTestState.cs similarity index 100% rename from src/dotnet-test-console/DotnetTestState.cs rename to src/Microsoft.DotNet.Tools.Test/DotnetTestState.cs diff --git a/src/dotnet-test-console/IDotnetTest.cs b/src/Microsoft.DotNet.Tools.Test/IDotnetTest.cs similarity index 100% rename from src/dotnet-test-console/IDotnetTest.cs rename to src/Microsoft.DotNet.Tools.Test/IDotnetTest.cs diff --git a/src/dotnet-test-console/IDotnetTestRunner.cs b/src/Microsoft.DotNet.Tools.Test/IDotnetTestRunner.cs similarity index 100% rename from src/dotnet-test-console/IDotnetTestRunner.cs rename to src/Microsoft.DotNet.Tools.Test/IDotnetTestRunner.cs diff --git a/src/dotnet-test-console/IDotnetTestRunnerFactory.cs b/src/Microsoft.DotNet.Tools.Test/IDotnetTestRunnerFactory.cs similarity index 100% rename from src/dotnet-test-console/IDotnetTestRunnerFactory.cs rename to src/Microsoft.DotNet.Tools.Test/IDotnetTestRunnerFactory.cs diff --git a/src/dotnet-test-console/ITestMessagesCollection.cs b/src/Microsoft.DotNet.Tools.Test/ITestMessagesCollection.cs similarity index 100% rename from src/dotnet-test-console/ITestMessagesCollection.cs rename to src/Microsoft.DotNet.Tools.Test/ITestMessagesCollection.cs diff --git a/src/dotnet-test-console/MessageHandlers/GetTestRunnerProcessStartInfoMessageHandler.cs b/src/Microsoft.DotNet.Tools.Test/MessageHandlers/GetTestRunnerProcessStartInfoMessageHandler.cs similarity index 100% rename from src/dotnet-test-console/MessageHandlers/GetTestRunnerProcessStartInfoMessageHandler.cs rename to src/Microsoft.DotNet.Tools.Test/MessageHandlers/GetTestRunnerProcessStartInfoMessageHandler.cs diff --git a/src/dotnet-test-console/MessageHandlers/IDotnetTestMessageHandler.cs b/src/Microsoft.DotNet.Tools.Test/MessageHandlers/IDotnetTestMessageHandler.cs similarity index 100% rename from src/dotnet-test-console/MessageHandlers/IDotnetTestMessageHandler.cs rename to src/Microsoft.DotNet.Tools.Test/MessageHandlers/IDotnetTestMessageHandler.cs diff --git a/src/dotnet-test-console/MessageHandlers/TestDiscoveryStartMessageHandler.cs b/src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestDiscoveryStartMessageHandler.cs similarity index 100% rename from src/dotnet-test-console/MessageHandlers/TestDiscoveryStartMessageHandler.cs rename to src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestDiscoveryStartMessageHandler.cs diff --git a/src/dotnet-test-console/MessageHandlers/TestMessageTypes.cs b/src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestMessageTypes.cs similarity index 100% rename from src/dotnet-test-console/MessageHandlers/TestMessageTypes.cs rename to src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestMessageTypes.cs diff --git a/src/dotnet-test-console/MessageHandlers/TestRunnerResultMessageHandler.cs b/src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestRunnerResultMessageHandler.cs similarity index 100% rename from src/dotnet-test-console/MessageHandlers/TestRunnerResultMessageHandler.cs rename to src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestRunnerResultMessageHandler.cs diff --git a/src/dotnet-test-console/MessageHandlers/TestRunnerTestCompletedMessageHandler.cs b/src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestRunnerTestCompletedMessageHandler.cs similarity index 100% rename from src/dotnet-test-console/MessageHandlers/TestRunnerTestCompletedMessageHandler.cs rename to src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestRunnerTestCompletedMessageHandler.cs diff --git a/src/dotnet-test-console/MessageHandlers/TestRunnerTestFoundMessageHandler.cs b/src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestRunnerTestFoundMessageHandler.cs similarity index 100% rename from src/dotnet-test-console/MessageHandlers/TestRunnerTestFoundMessageHandler.cs rename to src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestRunnerTestFoundMessageHandler.cs diff --git a/src/dotnet-test-console/MessageHandlers/TestRunnerTestResultMessageHandler.cs b/src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestRunnerTestResultMessageHandler.cs similarity index 100% rename from src/dotnet-test-console/MessageHandlers/TestRunnerTestResultMessageHandler.cs rename to src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestRunnerTestResultMessageHandler.cs diff --git a/src/dotnet-test-console/MessageHandlers/TestRunnerTestStartedMessageHandler.cs b/src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestRunnerTestStartedMessageHandler.cs similarity index 100% rename from src/dotnet-test-console/MessageHandlers/TestRunnerTestStartedMessageHandler.cs rename to src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestRunnerTestStartedMessageHandler.cs diff --git a/src/dotnet-test-console/MessageHandlers/TestRunnerWaitingCommandMessageHandler.cs b/src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestRunnerWaitingCommandMessageHandler.cs similarity index 100% rename from src/dotnet-test-console/MessageHandlers/TestRunnerWaitingCommandMessageHandler.cs rename to src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestRunnerWaitingCommandMessageHandler.cs diff --git a/src/dotnet-test-console/MessageHandlers/TestSessionTerminateMessageHandler.cs b/src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestSessionTerminateMessageHandler.cs similarity index 100% rename from src/dotnet-test-console/MessageHandlers/TestSessionTerminateMessageHandler.cs rename to src/Microsoft.DotNet.Tools.Test/MessageHandlers/TestSessionTerminateMessageHandler.cs diff --git a/src/dotnet-test-console/MessageHandlers/UnknownMessageHandler.cs b/src/Microsoft.DotNet.Tools.Test/MessageHandlers/UnknownMessageHandler.cs similarity index 100% rename from src/dotnet-test-console/MessageHandlers/UnknownMessageHandler.cs rename to src/Microsoft.DotNet.Tools.Test/MessageHandlers/UnknownMessageHandler.cs diff --git a/src/dotnet-test-console/MessageHandlers/VersionCheckMessageHandler.cs b/src/Microsoft.DotNet.Tools.Test/MessageHandlers/VersionCheckMessageHandler.cs similarity index 100% rename from src/dotnet-test-console/MessageHandlers/VersionCheckMessageHandler.cs rename to src/Microsoft.DotNet.Tools.Test/MessageHandlers/VersionCheckMessageHandler.cs diff --git a/src/dotnet-test-console/dotnet-test-console.xproj b/src/Microsoft.DotNet.Tools.Test/Microsoft.DotNet.Tools.Test.xproj similarity index 100% rename from src/dotnet-test-console/dotnet-test-console.xproj rename to src/Microsoft.DotNet.Tools.Test/Microsoft.DotNet.Tools.Test.xproj diff --git a/src/Microsoft.DotNet.Tools.Test/Properties/AssemblyInfo.cs b/src/Microsoft.DotNet.Tools.Test/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..f0993d023 --- /dev/null +++ b/src/Microsoft.DotNet.Tools.Test/Properties/AssemblyInfo.cs @@ -0,0 +1,5 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: InternalsVisibleTo("dotnet-test.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100039ac461fa5c82c7dd2557400c4fd4e9dcdf7ac47e3d572548c04cd4673e004916610f4ea5cbf86f2b1ca1cb824f2a7b3976afecfcf4eb72d9a899aa6786effa10c30399e6580ed848231fec48374e41b3acf8811931343fc2f73acf72dae745adbcb7063cc4b50550618383202875223fc75401351cd89c44bf9b50e7fa3796")] diff --git a/src/dotnet-test-console/README.md b/src/Microsoft.DotNet.Tools.Test/README.md similarity index 100% rename from src/dotnet-test-console/README.md rename to src/Microsoft.DotNet.Tools.Test/README.md diff --git a/src/dotnet-test-console/ReportingChannels/AdapterReportingChannel.cs b/src/Microsoft.DotNet.Tools.Test/ReportingChannels/AdapterReportingChannel.cs similarity index 100% rename from src/dotnet-test-console/ReportingChannels/AdapterReportingChannel.cs rename to src/Microsoft.DotNet.Tools.Test/ReportingChannels/AdapterReportingChannel.cs diff --git a/src/dotnet-test-console/ReportingChannels/IReportingChannel.cs b/src/Microsoft.DotNet.Tools.Test/ReportingChannels/IReportingChannel.cs similarity index 100% rename from src/dotnet-test-console/ReportingChannels/IReportingChannel.cs rename to src/Microsoft.DotNet.Tools.Test/ReportingChannels/IReportingChannel.cs diff --git a/src/dotnet-test-console/ReportingChannels/IReportingChannelFactory.cs b/src/Microsoft.DotNet.Tools.Test/ReportingChannels/IReportingChannelFactory.cs similarity index 100% rename from src/dotnet-test-console/ReportingChannels/IReportingChannelFactory.cs rename to src/Microsoft.DotNet.Tools.Test/ReportingChannels/IReportingChannelFactory.cs diff --git a/src/dotnet-test-console/ReportingChannels/ReportingChannel.cs b/src/Microsoft.DotNet.Tools.Test/ReportingChannels/ReportingChannel.cs similarity index 100% rename from src/dotnet-test-console/ReportingChannels/ReportingChannel.cs rename to src/Microsoft.DotNet.Tools.Test/ReportingChannels/ReportingChannel.cs diff --git a/src/dotnet-test-console/ReportingChannels/ReportingChannelFactory.cs b/src/Microsoft.DotNet.Tools.Test/ReportingChannels/ReportingChannelFactory.cs similarity index 100% rename from src/dotnet-test-console/ReportingChannels/ReportingChannelFactory.cs rename to src/Microsoft.DotNet.Tools.Test/ReportingChannels/ReportingChannelFactory.cs diff --git a/src/dotnet-test-console/ReportingChannels/TestRunnerReportingChannel.cs b/src/Microsoft.DotNet.Tools.Test/ReportingChannels/TestRunnerReportingChannel.cs similarity index 100% rename from src/dotnet-test-console/ReportingChannels/TestRunnerReportingChannel.cs rename to src/Microsoft.DotNet.Tools.Test/ReportingChannels/TestRunnerReportingChannel.cs diff --git a/src/dotnet-test-console/TestCommand.cs b/src/Microsoft.DotNet.Tools.Test/TestCommand.cs similarity index 100% rename from src/dotnet-test-console/TestCommand.cs rename to src/Microsoft.DotNet.Tools.Test/TestCommand.cs diff --git a/src/dotnet-test-console/TestHostTracing.cs b/src/Microsoft.DotNet.Tools.Test/TestHostTracing.cs similarity index 100% rename from src/dotnet-test-console/TestHostTracing.cs rename to src/Microsoft.DotNet.Tools.Test/TestHostTracing.cs diff --git a/src/dotnet-test-console/TestMessagesCollection.cs b/src/Microsoft.DotNet.Tools.Test/TestMessagesCollection.cs similarity index 100% rename from src/dotnet-test-console/TestMessagesCollection.cs rename to src/Microsoft.DotNet.Tools.Test/TestMessagesCollection.cs diff --git a/src/dotnet-test-console/TestProjectBuilder.cs b/src/Microsoft.DotNet.Tools.Test/TestProjectBuilder.cs similarity index 100% rename from src/dotnet-test-console/TestProjectBuilder.cs rename to src/Microsoft.DotNet.Tools.Test/TestProjectBuilder.cs diff --git a/src/dotnet-test-console/TestRunners/AssemblyTestRunnerResolver.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/AssemblyTestRunnerResolver.cs similarity index 100% rename from src/dotnet-test-console/TestRunners/AssemblyTestRunnerResolver.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/AssemblyTestRunnerResolver.cs diff --git a/src/dotnet-test-console/TestRunners/DiscoverTestsArgumentsBuilder.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/DiscoverTestsArgumentsBuilder.cs similarity index 100% rename from src/dotnet-test-console/TestRunners/DiscoverTestsArgumentsBuilder.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/DiscoverTestsArgumentsBuilder.cs diff --git a/src/dotnet-test-console/TestRunners/DotnetTestRunnerResolverFactory.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/DotnetTestRunnerResolverFactory.cs similarity index 100% rename from src/dotnet-test-console/TestRunners/DotnetTestRunnerResolverFactory.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/DotnetTestRunnerResolverFactory.cs diff --git a/src/dotnet-test-console/TestRunners/ITestRunner.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/ITestRunner.cs similarity index 100% rename from src/dotnet-test-console/TestRunners/ITestRunner.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/ITestRunner.cs diff --git a/src/dotnet-test-console/TestRunners/ITestRunnerArgumentsBuilder.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/ITestRunnerArgumentsBuilder.cs similarity index 100% rename from src/dotnet-test-console/TestRunners/ITestRunnerArgumentsBuilder.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/ITestRunnerArgumentsBuilder.cs diff --git a/src/dotnet-test-console/TestRunners/ITestRunnerFactory.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/ITestRunnerFactory.cs similarity index 100% rename from src/dotnet-test-console/TestRunners/ITestRunnerFactory.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/ITestRunnerFactory.cs diff --git a/src/dotnet-test-console/TestRunners/ITestRunnerResolver.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/ITestRunnerResolver.cs similarity index 100% rename from src/dotnet-test-console/TestRunners/ITestRunnerResolver.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/ITestRunnerResolver.cs diff --git a/src/dotnet-test-console/TestRunners/ParameterTestRunnerResolver.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/ParameterTestRunnerResolver.cs similarity index 100% rename from src/dotnet-test-console/TestRunners/ParameterTestRunnerResolver.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/ParameterTestRunnerResolver.cs diff --git a/src/dotnet-test-console/TestRunners/ProjectJsonTestRunner.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/ProjectJsonTestRunner.cs similarity index 100% rename from src/dotnet-test-console/TestRunners/ProjectJsonTestRunner.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/ProjectJsonTestRunner.cs diff --git a/src/dotnet-test-console/TestRunners/ProjectJsonTestRunnerResolver.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/ProjectJsonTestRunnerResolver.cs similarity index 100% rename from src/dotnet-test-console/TestRunners/ProjectJsonTestRunnerResolver.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/ProjectJsonTestRunnerResolver.cs diff --git a/src/dotnet-test-console/TestRunners/RunTestsArgumentsBuilder.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/RunTestsArgumentsBuilder.cs similarity index 100% rename from src/dotnet-test-console/TestRunners/RunTestsArgumentsBuilder.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/RunTestsArgumentsBuilder.cs diff --git a/src/dotnet-test-console/TestRunners/TestRunner.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/TestRunner.cs similarity index 100% rename from src/dotnet-test-console/TestRunners/TestRunner.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/TestRunner.cs diff --git a/src/dotnet-test-console/TestRunners/TestRunnerFactory.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/TestRunnerFactory.cs similarity index 100% rename from src/dotnet-test-console/TestRunners/TestRunnerFactory.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/TestRunnerFactory.cs diff --git a/src/dotnet-test-console/TestRunners/TestRunnerOperationFailedException.cs b/src/Microsoft.DotNet.Tools.Test/TestRunners/TestRunnerOperationFailedException.cs similarity index 100% rename from src/dotnet-test-console/TestRunners/TestRunnerOperationFailedException.cs rename to src/Microsoft.DotNet.Tools.Test/TestRunners/TestRunnerOperationFailedException.cs diff --git a/src/dotnet-test-console/TestStartInfo.cs b/src/Microsoft.DotNet.Tools.Test/TestStartInfo.cs similarity index 100% rename from src/dotnet-test-console/TestStartInfo.cs rename to src/Microsoft.DotNet.Tools.Test/TestStartInfo.cs diff --git a/src/dotnet-test-console/project.json b/src/Microsoft.DotNet.Tools.Test/project.json similarity index 100% rename from src/dotnet-test-console/project.json rename to src/Microsoft.DotNet.Tools.Test/project.json diff --git a/src/dotnet-test-console/Properties/AssemblyInfo.cs b/src/dotnet-test-console/Properties/AssemblyInfo.cs deleted file mode 100644 index 5179142ae..000000000 --- a/src/dotnet-test-console/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("dotnet_test_console")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("$safeprojectname$")] -[assembly: AssemblyCopyright("Copyright © 116")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. - -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM - -[assembly: Guid("6D028154-5518-4A56-BAD6-938A90E5BCF6")] -[assembly: InternalsVisibleTo("dotnet-test.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100039ac461fa5c82c7dd2557400c4fd4e9dcdf7ac47e3d572548c04cd4673e004916610f4ea5cbf86f2b1ca1cb824f2a7b3976afecfcf4eb72d9a899aa6786effa10c30399e6580ed848231fec48374e41b3acf8811931343fc2f73acf72dae745adbcb7063cc4b50550618383202875223fc75401351cd89c44bf9b50e7fa3796")] diff --git a/src/dotnet/project.json b/src/dotnet/project.json index dc4f85897..db2526fb9 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -45,7 +45,7 @@ "Microsoft.DotNet.Configurer": { "target": "project" }, - "dotnet-test-console": { + "Microsoft.DotNet.Tools.Test": { "target": "project" }, "Microsoft.NETCore.App": { diff --git a/test/dotnet-test.UnitTests/GivenAnAssemblyTestRunnerResolver.cs b/test/dotnet-test.UnitTests/GivenAnAssemblyTestRunnerResolver.cs index d56b6f2d4..0dd59788f 100644 --- a/test/dotnet-test.UnitTests/GivenAnAssemblyTestRunnerResolver.cs +++ b/test/dotnet-test.UnitTests/GivenAnAssemblyTestRunnerResolver.cs @@ -8,14 +8,13 @@ using System.Text.RegularExpressions; using FluentAssertions; using Microsoft.DotNet.Tools.Test; using Microsoft.Extensions.EnvironmentAbstractions; -using Microsoft.Extensions.Testing.Abstractions; using Xunit; namespace Microsoft.Dotnet.Tools.Test.Tests { public class GivenAnAssemblyTestRunnerResolver { - private const string DirectoryOfAssemblyUnderTest = "c:/some/path"; + private readonly string _directoryOfAssemblyUnderTest = Path.Combine("c:", "some", "path"); private const string TestRunnerName = "dotnet-test-someRunner"; @@ -26,9 +25,9 @@ namespace Microsoft.Dotnet.Tools.Test.Tests { var directoryMock = new DirectoryMock(); - directoryMock.AddFile(DirectoryOfAssemblyUnderTest, TestRunnerFileName); + directoryMock.AddFile(_directoryOfAssemblyUnderTest, TestRunnerFileName); - var pathToAssemblyUnderTest = Path.Combine(DirectoryOfAssemblyUnderTest, TestRunnerFileName); + var pathToAssemblyUnderTest = Path.Combine(_directoryOfAssemblyUnderTest, TestRunnerFileName); var assemblyTestRunnerResolver = new AssemblyTestRunnerResolver(pathToAssemblyUnderTest, directoryMock); var testRunner = assemblyTestRunnerResolver.ResolveTestRunner(); @@ -41,11 +40,11 @@ namespace Microsoft.Dotnet.Tools.Test.Tests { var directoryMock = new DirectoryMock(); - directoryMock.AddFile(DirectoryOfAssemblyUnderTest, TestRunnerFileName); - directoryMock.AddFile(DirectoryOfAssemblyUnderTest, "dotnet-test-someOtherTestRunner.dll"); - directoryMock.AddFile(DirectoryOfAssemblyUnderTest, "dotnet-test-AndYetAnotherTestRunner.dll"); + directoryMock.AddFile(_directoryOfAssemblyUnderTest, TestRunnerFileName); + directoryMock.AddFile(_directoryOfAssemblyUnderTest, "dotnet-test-someOtherTestRunner.dll"); + directoryMock.AddFile(_directoryOfAssemblyUnderTest, "dotnet-test-AndYetAnotherTestRunner.dll"); - var assemblyTestRunnerResolver = new AssemblyTestRunnerResolver(DirectoryOfAssemblyUnderTest, directoryMock); + var assemblyTestRunnerResolver = new AssemblyTestRunnerResolver(_directoryOfAssemblyUnderTest, directoryMock); var bestEffortTestRunner = assemblyTestRunnerResolver.ResolveTestRunner(); @@ -57,7 +56,7 @@ namespace Microsoft.Dotnet.Tools.Test.Tests { var directoryMock = new DirectoryMock(); - var assemblyTestRunnerResolver = new AssemblyTestRunnerResolver(DirectoryOfAssemblyUnderTest, directoryMock); + var assemblyTestRunnerResolver = new AssemblyTestRunnerResolver(_directoryOfAssemblyUnderTest, directoryMock); var testRunner = assemblyTestRunnerResolver.ResolveTestRunner(); @@ -66,7 +65,7 @@ namespace Microsoft.Dotnet.Tools.Test.Tests private class DirectoryMock : IDirectory { - private IList _files = new List(); + private readonly IList _files = new List(); public bool Exists(string path) { @@ -91,7 +90,7 @@ namespace Microsoft.Dotnet.Tools.Test.Tests public void AddFile(string path, string fileName) { - _files.Add($"{path}/{fileName}"); + _files.Add(Path.Combine(path, fileName)); } } } diff --git a/test/dotnet-test.UnitTests/project.json b/test/dotnet-test.UnitTests/project.json index 35b058573..a34d68a28 100644 --- a/test/dotnet-test.UnitTests/project.json +++ b/test/dotnet-test.UnitTests/project.json @@ -6,7 +6,7 @@ "version": "1.0.0" }, "Newtonsoft.Json": "9.0.1", - "dotnet-test-console": { + "Microsoft.DotNet.Tools.Test": { "target": "project" }, "Microsoft.DotNet.InternalAbstractions": {