Fix project/assembly/namespaces

MSTest.slnf

@@ -6,7 +6,7 @@
       "samples\\Playground\\Playground.csproj",
       "src\\Adapter\\MSTest.Engine\\MSTest.Engine.csproj",
       "src\\Adapter\\MSTest.TestAdapter\\MSTest.TestAdapter.csproj",
-      "src\\Adapter\\MSTestAdapter.PlatformServices\\MSTestAdapter.PlatformServices.csproj",
+      "src\\Adapter\\MSTest.PlatformServices\\MSTest.PlatformServices.csproj",
       "src\\Analyzers\\MSTest.Analyzers.CodeFixes\\MSTest.Analyzers.CodeFixes.csproj",
       "src\\Analyzers\\MSTest.Analyzers.Package\\MSTest.Analyzers.Package.csproj",
       "src\\Analyzers\\MSTest.Analyzers\\MSTest.Analyzers.csproj",
@@ -49,10 +49,10 @@
       "test\\IntegrationTests\\TestAssets\\TimeoutTestProject\\TimeoutTestProject.csproj",
       "test\\Performance\\MSTest.Performance.Runner\\MSTest.Performance.Runner.csproj",
       "test\\UnitTests\\MSTest.Analyzers.UnitTests\\MSTest.Analyzers.UnitTests.csproj",
-      "test\\UnitTests\\MSTestAdapter.PlatformServices.UnitTests\\MSTestAdapter.PlatformServices.UnitTests.csproj",
-      "test\\UnitTests\\MSTestAdapter.UnitTests\\MSTestAdapter.UnitTests.csproj",
+      "test\\UnitTests\\MSTest.PlatformServices.UnitTests\\MSTest.PlatformServices.UnitTests.csproj",
+      "test\\UnitTests\\MSTest.TestAdapter.UnitTests\\MSTest.TestAdapter.UnitTests.csproj",
       "test\\UnitTests\\MSTest.SelfRealExamples.UnitTests\\MSTest.SelfRealExamples.UnitTests.csproj",
-      "test\\UnitTests\\TestFramework.UnitTests\\TestFramework.UnitTests.csproj",
+      "test\\UnitTests\\MSTest.TestFramework.UnitTests\\MSTest.TestFramework.UnitTests.csproj",
       "test\\Utilities\\Automation.CLI\\Automation.CLI.csproj",
       "test\\Utilities\\Microsoft.Testing.TestInfrastructure\\Microsoft.Testing.TestInfrastructure.csproj",
       "test\\Utilities\\TestFramework.ForTestingMSTest\\TestFramework.ForTestingMSTest.csproj"

NonWindowsTests.slnf

@@ -4,7 +4,7 @@
     "projects": [
       "src\\Adapter\\MSTest.Engine\\MSTest.Engine.csproj",
       "src\\Adapter\\MSTest.TestAdapter\\MSTest.TestAdapter.csproj",
-      "src\\Adapter\\MSTestAdapter.PlatformServices\\MSTestAdapter.PlatformServices.csproj",
+      "src\\Adapter\\MSTest.PlatformServices\\MSTest.PlatformServices.csproj",
       "src\\Analyzers\\MSTest.Analyzers.CodeFixes\\MSTest.Analyzers.CodeFixes.csproj",
       "src\\Analyzers\\MSTest.Analyzers.Package\\MSTest.Analyzers.Package.csproj",
       "src\\Analyzers\\MSTest.Analyzers\\MSTest.Analyzers.csproj",

TestFx.slnx

@@ -49,7 +49,7 @@
   <Folder Name="/src/2 - Adapter/" Id="f7cf448e-306d-5d9b-7166-fa7205a8989c">
     <Project Path="src/Adapter/MSTest.Engine/MSTest.Engine.csproj" />
     <Project Path="src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj" />
-    <Project Path="src/Adapter/MSTestAdapter.PlatformServices/MSTestAdapter.PlatformServices.csproj" />
+    <Project Path="src/Adapter/MSTest.PlatformServices/MSTest.PlatformServices.csproj" />
   </Folder>
   <Folder Name="/src/3 - TestFramework/" Id="f28cc185-255f-b581-6ed3-c247f7096eb1">
     <Project Path="src/TestFramework/TestFramework.Extensions/TestFramework.Extensions.csproj" />
@@ -78,7 +78,7 @@
     <Project Path="test/IntegrationTests/MSTest.Acceptance.IntegrationTests/MSTest.Acceptance.IntegrationTests.csproj" />
     <Project Path="test/IntegrationTests/MSTest.IntegrationTests/MSTest.IntegrationTests.csproj" />
     <Project Path="test/IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests.csproj" />
-    <Project Path="test/IntegrationTests/PlatformServices.Desktop.IntegrationTests/PlatformServices.Desktop.IntegrationTests.csproj" />
+    <Project Path="test/IntegrationTests/MSTest.PlatformServices.IntegrationTests/MSTest.PlatformServices.IntegrationTests.csproj" />
   </Folder>
   <Folder Name="/test/IntegrationTests/TestAssets/" Id="05959510-e531-ecb6-7089-da3b202e43db">
     <File Path="test/IntegrationTests/TestAssets/Directory.Build.targets" />
@@ -127,8 +127,8 @@
     <Project Path="test/UnitTests/MSTest.Engine.UnitTests/MSTest.Engine.UnitTests.csproj" />
     <Project Path="test/UnitTests/MSTest.SelfRealExamples.UnitTests/MSTest.SelfRealExamples.UnitTests.csproj" />
     <Project Path="test/UnitTests/MSTest.SourceGeneration.UnitTests/MSTest.SourceGeneration.UnitTests.csproj" />
-    <Project Path="test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/MSTestAdapter.PlatformServices.UnitTests.csproj" />
-    <Project Path="test/UnitTests/MSTestAdapter.UnitTests/MSTestAdapter.UnitTests.csproj" />
-    <Project Path="test/UnitTests/TestFramework.UnitTests/TestFramework.UnitTests.csproj" />
+    <Project Path="test/UnitTests/MSTest.PlatformServices.UnitTests/MSTest.PlatformServices.UnitTests.csproj" />
+    <Project Path="test/UnitTests/MSTest.TestAdapter.UnitTests/MSTest.TestAdapter.UnitTests.csproj" />
+    <Project Path="test/UnitTests/MSTest.TestFramework.UnitTests/MSTest.TestFramework.UnitTests.csproj" />
   </Folder>
 </Solution>

eng/install-access-database-engine.ps1

@@ -1,7 +1,7 @@
 # This is required for DataSourceTests
 # Otherwise, the tests will fail with:
 # The unit test adapter failed to connect to the data source or to read the data. For more information on troubleshooting this error, see "Troubleshooting Data-Driven Unit Tests" (http://go.microsoft.com/fwlink/?LinkId=62412) in the MSDN Library. Error details: The 'Microsoft.Ace.OLEDB.12.0' provider is not registered on the local machine.
-#     at Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.TestDataSource.GetData(ITestMethod testMethodInfo, ITestContext testContext) in /_/src/Adapter/MSTestAdapter.PlatformServices/Services/TestDataSource.cs:84
+#     at MSTest.PlatformServices.TestDataSource.GetData(ITestMethod testMethodInfo, ITestContext testContext) in /_/src/Adapter/MSTest.PlatformServices/Services/TestDataSource.cs:84
 # The direct download link originates from https://www.microsoft.com/en-us/download/details.aspx?id=54920&msockid=01fa77be234c617f31936293223560aa
 Invoke-RestMethod https://download.microsoft.com/download/3/5/C/35C84C36-661A-44E6-9324-8786B8DBE231/accessdatabaseengine_X64.exe -OutFile ./accessdatabaseengine_X64.exe
 Start-Process ./accessdatabaseengine_X64.exe -Wait -ArgumentList "/quiet /passive /norestart"

samples/Playground/Program.cs

@@ -8,7 +8,9 @@
 using Microsoft.Testing.Platform.Messages;
 #if NETCOREAPP
 using Microsoft.Testing.Platform.ServerMode.IntegrationTests.Messages.V100;
+
 using MSTest.Acceptance.IntegrationTests.Messages.V100;
+
 #endif
 using Microsoft.Testing.Platform.TestHost;
 using Microsoft.VisualStudio.TestTools.UnitTesting;

src/Adapter/MSTestAdapter.PlatformServices/AssemblyResolver.cs → src/Adapter/MSTest.PlatformServices/AssemblyResolver.cs

@@ -11,7 +11,7 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
+namespace MSTest.PlatformServices;
 
 /// <summary>
 /// Helps resolve MSTestFramework assemblies for CLR loader.
@@ -57,7 +57,7 @@ class AssemblyResolver :
     /// saying we could not find en-gb resource dll which is normal. For more information,
     /// <see href="https://github.com/microsoft/testfx/issues/1598" />.
     /// </remarks>
-    private const string PlatformServicesResourcesName = "Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.resources";
+    private const string PlatformServicesResourcesName = "MSTest.PlatformServices.resources";
 
     /// <summary>
     /// This will have the list of all directories read from runsettings.

src/Adapter/MSTestAdapter.PlatformServices/Data/CsvDataConnection.cs → src/Adapter/MSTest.PlatformServices/Data/CsvDataConnection.cs

@@ -9,7 +9,7 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Data;
+namespace MSTest.PlatformServices.Data;
 
 /// <summary>
 ///      Utility classes to access databases, and to handle quoted strings etc for comma separated value files.

src/Adapter/MSTestAdapter.PlatformServices/Data/OdbcDataConnection.cs → src/Adapter/MSTest.PlatformServices/Data/OdbcDataConnection.cs

@@ -7,7 +7,7 @@
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Data;
+namespace MSTest.PlatformServices.Data;
 
 /// <summary>
 ///      Utility classes to access databases, and to handle quoted strings etc for ODBC.

src/Adapter/MSTestAdapter.PlatformServices/Data/OleDataConnection.cs → src/Adapter/MSTest.PlatformServices/Data/OleDataConnection.cs

@@ -7,7 +7,7 @@
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Data;
+namespace MSTest.PlatformServices;
 
 /// <summary>
 ///      Utility classes to access databases, and to handle quoted strings etc for OLE DB.

src/Adapter/MSTestAdapter.PlatformServices/Data/SqlDataConnection.cs → src/Adapter/MSTest.PlatformServices/Data/SqlDataConnection.cs

@@ -7,7 +7,7 @@
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Data;
+namespace MSTest.PlatformServices;
 
 /// <summary>
 ///      Utility classes to access databases, and to handle quoted strings etc for SQL Server.

src/Adapter/MSTestAdapter.PlatformServices/Data/TestDataConnection.cs → src/Adapter/MSTest.PlatformServices/Data/TestDataConnection.cs

@@ -8,7 +8,7 @@
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Data;
+namespace MSTest.PlatformServices;
 
 /// <summary>
 /// This used to be "DataUtility", a helper class to handle quoted strings etc for different

src/Adapter/MSTestAdapter.PlatformServices/Data/TestDataConnectionFactory.cs → src/Adapter/MSTest.PlatformServices/Data/TestDataConnectionFactory.cs

@@ -5,7 +5,9 @@
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Data;
+using MSTest.PlatformServices.Data;
+
+namespace MSTest.PlatformServices;
 
 /// <summary>
 /// Defines a class that creates TestDataConnection instances to connect to data sources.

src/Adapter/MSTestAdapter.PlatformServices/Data/TestDataConnectionSql.cs → src/Adapter/MSTest.PlatformServices/Data/TestDataConnectionSql.cs

@@ -11,7 +11,9 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Data;
+using MSTest.PlatformServices.Data;
+
+namespace MSTest.PlatformServices;
 
 /// <summary>
 ///  Data connections based on direct DB implementations all derive from this one.

src/Adapter/MSTestAdapter.PlatformServices/Data/XmlDataConnection.cs → src/Adapter/MSTest.PlatformServices/Data/XmlDataConnection.cs

@@ -8,7 +8,7 @@
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Data;
+namespace MSTest.PlatformServices.Data;
 
 /// <summary>
 ///      Utility classes to access databases, and to handle quoted strings etc for XML data.

src/Adapter/MSTestAdapter.PlatformServices/Deployment/AssemblyLoadWorker.cs → src/Adapter/MSTest.PlatformServices/Deployment/AssemblyLoadWorker.cs

@@ -3,10 +3,11 @@
 
 #if NETFRAMEWORK
 
-using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
+using MSTest.PlatformServices.Utilities;
+
+namespace MSTest.PlatformServices;
 
 /*
  * /!\ WARNING /!\

src/Adapter/MSTestAdapter.PlatformServices/Deployment/DeploymentItem.cs → src/Adapter/MSTest.PlatformServices/Deployment/DeploymentItem.cs

@@ -5,7 +5,7 @@
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
+namespace MSTest.PlatformServices;
 
 /// <summary>
 /// Specifies type of deployment item origin, where the item comes from.

src/Adapter/MSTestAdapter.PlatformServices/Deployment/TestRunDirectories.cs → src/Adapter/MSTest.PlatformServices/Deployment/TestRunDirectories.cs

@@ -5,7 +5,7 @@
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
+namespace MSTest.PlatformServices.Deployment;
 
 /// <summary>
 /// The test run directories.

src/Adapter/MSTestAdapter.PlatformServices/Discovery/AssemblyEnumerationResult.cs → src/Adapter/MSTest.PlatformServices/Discovery/AssemblyEnumerationResult.cs

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
+using MSTest.PlatformServices.ObjectModel;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
+namespace MSTest.PlatformServices.Discovery;
 
 /// <summary>
 /// Helps us communicate results that were created inside of AppDomain, when AppDomains are available and enabled.

src/Adapter/MSTestAdapter.PlatformServices/Discovery/AssemblyEnumerator.cs → src/Adapter/MSTest.PlatformServices/Discovery/AssemblyEnumerator.cs

@@ -4,15 +4,15 @@
 using System.Runtime.Serialization;
 using System.Security;
 
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
-using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.Internal;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
+using MSTest.PlatformServices.Execution;
+using MSTest.PlatformServices.Helpers;
+using MSTest.PlatformServices.ObjectModel;
+
+namespace MSTest.PlatformServices.Discovery;
 
 /// <summary>
 /// Enumerates through all types in the assembly in search of valid test methods.

src/Adapter/MSTestAdapter.PlatformServices/Discovery/AssemblyEnumeratorWrapper.cs → src/Adapter/MSTest.PlatformServices/Discovery/AssemblyEnumeratorWrapper.cs

@@ -1,12 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
-using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
+using MSTest.PlatformServices.Interface;
+using MSTest.PlatformServices.ObjectModel;
+
+namespace MSTest.PlatformServices.Discovery;
 
 /// <summary>
 /// Enumerates through an assembly to get a set of test methods.
@@ -84,12 +85,12 @@ internal sealed class AssemblyEnumeratorWrapper
 
     private static AssemblyEnumerationResult GetTestsInIsolation(string fullFilePath, IRunSettings? runSettings)
     {
-        using MSTestAdapter.PlatformServices.Interface.ITestSourceHost isolationHost = PlatformServiceProvider.Instance.CreateTestSourceHost(fullFilePath, runSettings, frameworkHandle: null);
+        using MSTest.PlatformServices.Interface.ITestSourceHost isolationHost = PlatformServiceProvider.Instance.CreateTestSourceHost(fullFilePath, runSettings, frameworkHandle: null);
 
         // Create an instance of a type defined in adapter so that adapter gets loaded in the child app domain
         var assemblyEnumerator = (AssemblyEnumerator)isolationHost.CreateInstanceForType(typeof(AssemblyEnumerator), [MSTestSettings.CurrentSettings])!;
 
-        // This might not be supported if an older version of Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices
+        // This might not be supported if an older version of MSTest.PlatformServices
         // assembly is already loaded into the App Domain.
         string? xml = null;
         try

src/Adapter/MSTestAdapter.PlatformServices/Discovery/DiscoveryTestMethodInfo.cs → src/Adapter/MSTest.PlatformServices/Discovery/DiscoveryTestMethodInfo.cs

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
+using MSTest.PlatformServices.Execution;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
+namespace MSTest.PlatformServices.Discovery;
 
 internal readonly struct DiscoveryTestMethodInfo
 {

src/Adapter/MSTestAdapter.PlatformServices/Discovery/TestMethodValidator.cs → src/Adapter/MSTest.PlatformServices/Discovery/TestMethodValidator.cs

@@ -1,11 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
+using MSTest.PlatformServices.Extensions;
+using MSTest.PlatformServices.Helpers;
+
+namespace MSTest.PlatformServices.Discovery;
 
 /// <summary>
 /// Determines if a method is a valid test method.

src/Adapter/MSTestAdapter.PlatformServices/Discovery/TypeEnumerator.cs → src/Adapter/MSTest.PlatformServices/Discovery/TypeEnumerator.cs

@@ -3,12 +3,13 @@
 
 using Microsoft.TestPlatform.AdapterUtilities;
 using Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities;
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
+using MSTest.PlatformServices.Extensions;
+using MSTest.PlatformServices.Helpers;
+using MSTest.PlatformServices.ObjectModel;
+
+namespace MSTest.PlatformServices.Discovery;
 
 /// <summary>
 /// Enumerates through the type looking for Valid Test Methods to execute.

src/Adapter/MSTestAdapter.PlatformServices/Discovery/TypeValidator.cs → src/Adapter/MSTest.PlatformServices/Discovery/TypeValidator.cs

@@ -1,10 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
+using MSTest.PlatformServices.Helpers;
+
+namespace MSTest.PlatformServices.Discovery;
 
 /// <summary>
 /// Determines whether a type is a valid test class for this adapter.

src/Adapter/MSTestAdapter.PlatformServices/Discovery/UnitTestDiscoverer.cs → src/Adapter/MSTest.PlatformServices/Discovery/UnitTestDiscoverer.cs

@@ -1,16 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
-using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
-using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
+using MSTest.PlatformServices.Discovery;
+using MSTest.PlatformServices.Interface;
+using MSTest.PlatformServices.ObjectModel;
+
+namespace MSTest.PlatformServices;
 
 [SuppressMessage("Performance", "CA1852: Seal internal types", Justification = "Overrides required for testability")]
 internal class UnitTestDiscoverer

src/Adapter/MSTestAdapter.PlatformServices/EngineConstants.cs → src/Adapter/MSTest.PlatformServices/EngineConstants.cs

@@ -3,7 +3,7 @@
 
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
+namespace MSTest.PlatformServices;
 
 internal static class EngineConstants
 {

src/Adapter/MSTestAdapter.PlatformServices/Execution/ClassCleanupManager.cs → src/Adapter/MSTest.PlatformServices/Execution/ClassCleanupManager.cs

@@ -1,12 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
-using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
+using MSTest.PlatformServices.ObjectModel;
+
+namespace MSTest.PlatformServices.Execution;
 
 internal sealed class ClassCleanupManager
 {

src/Adapter/MSTestAdapter.PlatformServices/Execution/ConsoleErrorRouter.cs → src/Adapter/MSTest.PlatformServices/Execution/ConsoleErrorRouter.cs

@@ -1,9 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
-
-namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
+namespace MSTest.PlatformServices.Execution;
 
 internal sealed class ConsoleErrorRouter : TextWriter
 {