diff --git a/Directory.Build.props b/Directory.Build.props
index 25e725ef65..61eb4bf732 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -67,4 +67,13 @@
0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7
+
+
+
+
+
+
+
+
+
diff --git a/samples/FxExtensibility/AssertEx.cs b/samples/FxExtensibility/AssertEx.cs
index 595d001974..6e9abb7eb6 100644
--- a/samples/FxExtensibility/AssertEx.cs
+++ b/samples/FxExtensibility/AssertEx.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace MSTest.Extensibility.Samples;
diff --git a/samples/FxExtensibility/AssertIs.cs b/samples/FxExtensibility/AssertIs.cs
index 91d3c662a7..eff6cfed75 100644
--- a/samples/FxExtensibility/AssertIs.cs
+++ b/samples/FxExtensibility/AssertIs.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace MSTest.Extensibility.Samples;
diff --git a/samples/Playground/DebuggerUtility.cs b/samples/Playground/DebuggerUtility.cs
index 55fb8c75eb..3c89c2ea1a 100644
--- a/samples/Playground/DebuggerUtility.cs
+++ b/samples/Playground/DebuggerUtility.cs
@@ -5,10 +5,6 @@
#pragma warning disable CA1837 // Use 'Environment.ProcessId'
#pragma warning disable CA1416 // Validate platform compatibility
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
diff --git a/samples/Playground/ServerMode/TestingPlatformClientFactory.cs b/samples/Playground/ServerMode/TestingPlatformClientFactory.cs
index 2167bdefcd..713c8cda16 100644
--- a/samples/Playground/ServerMode/TestingPlatformClientFactory.cs
+++ b/samples/Playground/ServerMode/TestingPlatformClientFactory.cs
@@ -2,11 +2,8 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections;
-using System.Diagnostics;
-using System.Globalization;
using System.Net;
using System.Net.Sockets;
-using System.Text;
using Microsoft.Testing.Platform.ServerMode.IntegrationTests.Messages.V100;
diff --git a/samples/Playground/ServerMode/v1.0.0/ClientInfo.cs b/samples/Playground/ServerMode/v1.0.0/ClientInfo.cs
index a4548d891f..5acc6821ed 100644
--- a/samples/Playground/ServerMode/v1.0.0/ClientInfo.cs
+++ b/samples/Playground/ServerMode/v1.0.0/ClientInfo.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Text.Json;
-
using Newtonsoft.Json;
namespace Microsoft.Testing.Platform.ServerMode.IntegrationTests.Messages.V100;
diff --git a/samples/Playground/ServerMode/v1.0.0/InitializeRequest.cs b/samples/Playground/ServerMode/v1.0.0/InitializeRequest.cs
index abf5adb281..f15e94ab37 100644
--- a/samples/Playground/ServerMode/v1.0.0/InitializeRequest.cs
+++ b/samples/Playground/ServerMode/v1.0.0/InitializeRequest.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Text.Json;
-
using Newtonsoft.Json;
namespace Microsoft.Testing.Platform.ServerMode.IntegrationTests.Messages.V100;
diff --git a/samples/Playground/ServerMode/v1.0.0/ServerInfo.cs b/samples/Playground/ServerMode/v1.0.0/ServerInfo.cs
index ccab026462..e2b0e4a49f 100644
--- a/samples/Playground/ServerMode/v1.0.0/ServerInfo.cs
+++ b/samples/Playground/ServerMode/v1.0.0/ServerInfo.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Text.Json;
-
using Newtonsoft.Json;
namespace Microsoft.Testing.Platform.ServerMode.IntegrationTests.Messages.V100;
diff --git a/samples/Playground/ServerMode/v1.0.0/TestingPlatformClient.cs b/samples/Playground/ServerMode/v1.0.0/TestingPlatformClient.cs
index 57a585299b..321b5d033c 100644
--- a/samples/Playground/ServerMode/v1.0.0/TestingPlatformClient.cs
+++ b/samples/Playground/ServerMode/v1.0.0/TestingPlatformClient.cs
@@ -2,9 +2,7 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Concurrent;
-using System.Diagnostics;
using System.Net.Sockets;
-using System.Text;
using MSTest.Acceptance.IntegrationTests.Messages.V100;
diff --git a/src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs b/src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs
index e810b570de..884fe813fb 100644
--- a/src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs
+++ b/src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs
@@ -1,12 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
using System.Runtime.Serialization;
using System.Security;
-using System.Text;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
diff --git a/src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumeratorWrapper.cs b/src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumeratorWrapper.cs
index 84fd028284..53ec74c28f 100644
--- a/src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumeratorWrapper.cs
+++ b/src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumeratorWrapper.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTest.TestAdapter/Discovery/TestMethodValidator.cs b/src/Adapter/MSTest.TestAdapter/Discovery/TestMethodValidator.cs
index 005a6f2262..2669c119ad 100644
--- a/src/Adapter/MSTest.TestAdapter/Discovery/TestMethodValidator.cs
+++ b/src/Adapter/MSTest.TestAdapter/Discovery/TestMethodValidator.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTest.TestAdapter/Discovery/TypeEnumerator.cs b/src/Adapter/MSTest.TestAdapter/Discovery/TypeEnumerator.cs
index ca1eaf47a1..07d9327abd 100644
--- a/src/Adapter/MSTest.TestAdapter/Discovery/TypeEnumerator.cs
+++ b/src/Adapter/MSTest.TestAdapter/Discovery/TypeEnumerator.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.TestPlatform.AdapterUtilities;
using Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
diff --git a/src/Adapter/MSTest.TestAdapter/Discovery/TypeValidator.cs b/src/Adapter/MSTest.TestAdapter/Discovery/TypeValidator.cs
index 89529b150c..9e8e1c98d6 100644
--- a/src/Adapter/MSTest.TestAdapter/Discovery/TypeValidator.cs
+++ b/src/Adapter/MSTest.TestAdapter/Discovery/TypeValidator.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTest.TestAdapter/Discovery/UnitTestDiscoverer.cs b/src/Adapter/MSTest.TestAdapter/Discovery/UnitTestDiscoverer.cs
index d81212d69c..b3b92c1548 100644
--- a/src/Adapter/MSTest.TestAdapter/Discovery/UnitTestDiscoverer.cs
+++ b/src/Adapter/MSTest.TestAdapter/Discovery/UnitTestDiscoverer.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
diff --git a/src/Adapter/MSTest.TestAdapter/DynamicDataOperations.cs b/src/Adapter/MSTest.TestAdapter/DynamicDataOperations.cs
index c33c1f1b7d..0eb2c5c2b9 100644
--- a/src/Adapter/MSTest.TestAdapter/DynamicDataOperations.cs
+++ b/src/Adapter/MSTest.TestAdapter/DynamicDataOperations.cs
@@ -2,9 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
#if NET471_OR_GREATER || NETCOREAPP
using System.Runtime.CompilerServices;
#endif
diff --git a/src/Adapter/MSTest.TestAdapter/Execution/ExceptionHelper.cs b/src/Adapter/MSTest.TestAdapter/Execution/ExceptionHelper.cs
index 5f2c2be59c..90acd6cd0b 100644
--- a/src/Adapter/MSTest.TestAdapter/Execution/ExceptionHelper.cs
+++ b/src/Adapter/MSTest.TestAdapter/Execution/ExceptionHelper.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Text;
-using System.Text.RegularExpressions;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTest.TestAdapter/Execution/LogMessageListener.cs b/src/Adapter/MSTest.TestAdapter/Execution/LogMessageListener.cs
index b574bd1f15..7e3dc95d39 100644
--- a/src/Adapter/MSTest.TestAdapter/Execution/LogMessageListener.cs
+++ b/src/Adapter/MSTest.TestAdapter/Execution/LogMessageListener.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
diff --git a/src/Adapter/MSTest.TestAdapter/Execution/TestAssemblyInfo.cs b/src/Adapter/MSTest.TestAdapter/Execution/TestAssemblyInfo.cs
index 2af076c1a9..2bebe6318e 100644
--- a/src/Adapter/MSTest.TestAdapter/Execution/TestAssemblyInfo.cs
+++ b/src/Adapter/MSTest.TestAdapter/Execution/TestAssemblyInfo.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
diff --git a/src/Adapter/MSTest.TestAdapter/Execution/TestClassInfo.cs b/src/Adapter/MSTest.TestAdapter/Execution/TestClassInfo.cs
index 7fb4dd3131..210a437a32 100644
--- a/src/Adapter/MSTest.TestAdapter/Execution/TestClassInfo.cs
+++ b/src/Adapter/MSTest.TestAdapter/Execution/TestClassInfo.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
using System.Runtime.InteropServices;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
diff --git a/src/Adapter/MSTest.TestAdapter/Execution/TestExecutionManager.cs b/src/Adapter/MSTest.TestAdapter/Execution/TestExecutionManager.cs
index 1474062496..067d5aa18c 100644
--- a/src/Adapter/MSTest.TestAdapter/Execution/TestExecutionManager.cs
+++ b/src/Adapter/MSTest.TestAdapter/Execution/TestExecutionManager.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Concurrent;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
using System.Runtime.InteropServices;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
diff --git a/src/Adapter/MSTest.TestAdapter/Execution/TestMethodInfo.cs b/src/Adapter/MSTest.TestAdapter/Execution/TestMethodInfo.cs
index 259903d3d4..5a2152f2be 100644
--- a/src/Adapter/MSTest.TestAdapter/Execution/TestMethodInfo.cs
+++ b/src/Adapter/MSTest.TestAdapter/Execution/TestMethodInfo.cs
@@ -1,12 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-using System.Text;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
diff --git a/src/Adapter/MSTest.TestAdapter/Execution/TestMethodRunner.cs b/src/Adapter/MSTest.TestAdapter/Execution/TestMethodRunner.cs
index 017f45b100..e185ef3fa1 100644
--- a/src/Adapter/MSTest.TestAdapter/Execution/TestMethodRunner.cs
+++ b/src/Adapter/MSTest.TestAdapter/Execution/TestMethodRunner.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
using System.Runtime.InteropServices;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
diff --git a/src/Adapter/MSTest.TestAdapter/Execution/TypeCache.cs b/src/Adapter/MSTest.TestAdapter/Execution/TypeCache.cs
index 76fb7e3c4c..c714c525e0 100644
--- a/src/Adapter/MSTest.TestAdapter/Execution/TypeCache.cs
+++ b/src/Adapter/MSTest.TestAdapter/Execution/TypeCache.cs
@@ -2,11 +2,7 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Concurrent;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
using System.Security;
-using System.Text;
using Microsoft.TestPlatform.AdapterUtilities.ManagedNameUtilities;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
diff --git a/src/Adapter/MSTest.TestAdapter/Execution/UnitTestRunner.cs b/src/Adapter/MSTest.TestAdapter/Execution/UnitTestRunner.cs
index 8f706dd7a8..1f1d7f57d3 100644
--- a/src/Adapter/MSTest.TestAdapter/Execution/UnitTestRunner.cs
+++ b/src/Adapter/MSTest.TestAdapter/Execution/UnitTestRunner.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Concurrent;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
using System.Security;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
diff --git a/src/Adapter/MSTest.TestAdapter/Extensions/ExceptionExtensions.cs b/src/Adapter/MSTest.TestAdapter/Extensions/ExceptionExtensions.cs
index 318320906b..648fbc41db 100644
--- a/src/Adapter/MSTest.TestAdapter/Extensions/ExceptionExtensions.cs
+++ b/src/Adapter/MSTest.TestAdapter/Extensions/ExceptionExtensions.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTest.TestAdapter/Extensions/MethodInfoExtensions.cs b/src/Adapter/MSTest.TestAdapter/Extensions/MethodInfoExtensions.cs
index e3efef79a4..255e9f0f3c 100644
--- a/src/Adapter/MSTest.TestAdapter/Extensions/MethodInfoExtensions.cs
+++ b/src/Adapter/MSTest.TestAdapter/Extensions/MethodInfoExtensions.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
using System.Runtime.CompilerServices;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
diff --git a/src/Adapter/MSTest.TestAdapter/Helpers/FixtureMethodRunner.cs b/src/Adapter/MSTest.TestAdapter/Helpers/FixtureMethodRunner.cs
index f4c60e6e4b..7596fb7719 100644
--- a/src/Adapter/MSTest.TestAdapter/Helpers/FixtureMethodRunner.cs
+++ b/src/Adapter/MSTest.TestAdapter/Helpers/FixtureMethodRunner.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
using System.Runtime.InteropServices;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
diff --git a/src/Adapter/MSTest.TestAdapter/Helpers/ReflectHelper.cs b/src/Adapter/MSTest.TestAdapter/Helpers/ReflectHelper.cs
index f321c9fb10..3eb54c9939 100644
--- a/src/Adapter/MSTest.TestAdapter/Helpers/ReflectHelper.cs
+++ b/src/Adapter/MSTest.TestAdapter/Helpers/ReflectHelper.cs
@@ -2,9 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Concurrent;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
using System.Security;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
diff --git a/src/Adapter/MSTest.TestAdapter/Helpers/RunSettingsUtilities.cs b/src/Adapter/MSTest.TestAdapter/Helpers/RunSettingsUtilities.cs
index 62b5a7e147..2503c9f3bb 100644
--- a/src/Adapter/MSTest.TestAdapter/Helpers/RunSettingsUtilities.cs
+++ b/src/Adapter/MSTest.TestAdapter/Helpers/RunSettingsUtilities.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Xml;
-
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTest.TestAdapter/Helpers/TestRunParameters.cs b/src/Adapter/MSTest.TestAdapter/Helpers/TestRunParameters.cs
index 6703b44ce1..9a324be172 100644
--- a/src/Adapter/MSTest.TestAdapter/Helpers/TestRunParameters.cs
+++ b/src/Adapter/MSTest.TestAdapter/Helpers/TestRunParameters.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Xml;
-
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
diff --git a/src/Adapter/MSTest.TestAdapter/MSTestSettings.cs b/src/Adapter/MSTest.TestAdapter/MSTestSettings.cs
index 1be800f802..129569eb5d 100644
--- a/src/Adapter/MSTest.TestAdapter/MSTestSettings.cs
+++ b/src/Adapter/MSTest.TestAdapter/MSTestSettings.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Xml;
using System.Xml.Linq;
using Microsoft.Testing.Platform.Configurations;
diff --git a/src/Adapter/MSTest.TestAdapter/ObjectModel/TestMethod.cs b/src/Adapter/MSTest.TestAdapter/ObjectModel/TestMethod.cs
index e24df2d56c..61d75236bf 100644
--- a/src/Adapter/MSTest.TestAdapter/ObjectModel/TestMethod.cs
+++ b/src/Adapter/MSTest.TestAdapter/ObjectModel/TestMethod.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.ObjectModel;
-using System.Diagnostics.CodeAnalysis;
using Microsoft.TestPlatform.AdapterUtilities;
diff --git a/src/Adapter/MSTest.TestAdapter/ObjectModel/UnitTestElement.cs b/src/Adapter/MSTest.TestAdapter/ObjectModel/UnitTestElement.cs
index befe0aa491..a585c6afde 100644
--- a/src/Adapter/MSTest.TestAdapter/ObjectModel/UnitTestElement.cs
+++ b/src/Adapter/MSTest.TestAdapter/ObjectModel/UnitTestElement.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
-
using Microsoft.TestPlatform.AdapterUtilities;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
diff --git a/src/Adapter/MSTest.TestAdapter/ObjectModel/UnitTestResult.cs b/src/Adapter/MSTest.TestAdapter/ObjectModel/UnitTestResult.cs
index 57f2ec8e28..73b33d4468 100644
--- a/src/Adapter/MSTest.TestAdapter/ObjectModel/UnitTestResult.cs
+++ b/src/Adapter/MSTest.TestAdapter/ObjectModel/UnitTestResult.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTest.TestAdapter/PlatformServiceProvider.cs b/src/Adapter/MSTest.TestAdapter/PlatformServiceProvider.cs
index 38d8259a8e..c4f2ddf7df 100644
--- a/src/Adapter/MSTest.TestAdapter/PlatformServiceProvider.cs
+++ b/src/Adapter/MSTest.TestAdapter/PlatformServiceProvider.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
#if !WINDOWS_UWP
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.SourceGeneration;
#endif
diff --git a/src/Adapter/MSTest.TestAdapter/RunConfigurationSettings.cs b/src/Adapter/MSTest.TestAdapter/RunConfigurationSettings.cs
index e9a1701c71..d2386624c9 100644
--- a/src/Adapter/MSTest.TestAdapter/RunConfigurationSettings.cs
+++ b/src/Adapter/MSTest.TestAdapter/RunConfigurationSettings.cs
@@ -1,12 +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 System.Diagnostics.CodeAnalysis;
-using System.Xml;
-
#if !WINDOWS_UWP
-using System.Globalization;
-
using Microsoft.Testing.Platform.Configurations;
#endif
diff --git a/src/Adapter/MSTest.TestAdapter/SourceGeneration/SourceGeneratedReflectionOperations.cs b/src/Adapter/MSTest.TestAdapter/SourceGeneration/SourceGeneratedReflectionOperations.cs
index 19877998ab..16bd0f9454 100644
--- a/src/Adapter/MSTest.TestAdapter/SourceGeneration/SourceGeneratedReflectionOperations.cs
+++ b/src/Adapter/MSTest.TestAdapter/SourceGeneration/SourceGeneratedReflectionOperations.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if !WINDOWS_UWP
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
diff --git a/src/Adapter/MSTest.TestAdapter/TestingPlatformAdapter/MSTestBridgedTestFramework.cs b/src/Adapter/MSTest.TestAdapter/TestingPlatformAdapter/MSTestBridgedTestFramework.cs
index 6a9ca840a1..a5af5cb408 100644
--- a/src/Adapter/MSTest.TestAdapter/TestingPlatformAdapter/MSTestBridgedTestFramework.cs
+++ b/src/Adapter/MSTest.TestAdapter/TestingPlatformAdapter/MSTestBridgedTestFramework.cs
@@ -2,9 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if !WINDOWS_UWP
-using System.Diagnostics;
-using System.Reflection;
-
using Microsoft.Testing.Extensions.VSTestBridge;
using Microsoft.Testing.Extensions.VSTestBridge.Requests;
using Microsoft.Testing.Platform.Capabilities.TestFramework;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/AssemblyResolver.cs b/src/Adapter/MSTestAdapter.PlatformServices/AssemblyResolver.cs
index 6e09cd6020..d28be18d55 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/AssemblyResolver.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/AssemblyResolver.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if NETFRAMEWORK || NET
-using System.Diagnostics;
-using System.Reflection;
#if NETFRAMEWORK
using System.Runtime.InteropServices.WindowsRuntime;
using System.Security;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Data/CsvDataConnection.cs b/src/Adapter/MSTestAdapter.PlatformServices/Data/CsvDataConnection.cs
index 759b8f9645..ed7c443666 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Data/CsvDataConnection.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Data/CsvDataConnection.cs
@@ -6,9 +6,6 @@
using System.Collections;
using System.Data;
using System.Data.OleDb;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Data/TestDataConnection.cs b/src/Adapter/MSTestAdapter.PlatformServices/Data/TestDataConnection.cs
index 799a4cfbfd..c0a6676e47 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Data/TestDataConnection.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Data/TestDataConnection.cs
@@ -5,8 +5,6 @@
using System.Collections;
using System.Data;
using System.Data.Common;
-using System.Diagnostics;
-using System.Globalization;
using System.Security;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Data/TestDataConnectionSql.cs b/src/Adapter/MSTestAdapter.PlatformServices/Data/TestDataConnectionSql.cs
index 1f9ca7507c..84874d30f6 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Data/TestDataConnectionSql.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Data/TestDataConnectionSql.cs
@@ -8,9 +8,6 @@
using System.Data.Odbc;
using System.Data.OleDb;
using System.Data.SqlClient;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Data/XmlDataConnection.cs b/src/Adapter/MSTestAdapter.PlatformServices/Data/XmlDataConnection.cs
index dfa7b3be55..8a9d806497 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Data/XmlDataConnection.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Data/XmlDataConnection.cs
@@ -4,10 +4,7 @@
#if NETFRAMEWORK
using System.Collections;
using System.Data;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
using System.Security;
-using System.Xml;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Deployment/AssemblyLoadWorker.cs b/src/Adapter/MSTestAdapter.PlatformServices/Deployment/AssemblyLoadWorker.cs
index 7caef27a5a..1d3850dec8 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Deployment/AssemblyLoadWorker.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Deployment/AssemblyLoadWorker.cs
@@ -3,9 +3,6 @@
#if NETFRAMEWORK
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Deployment/DeploymentItem.cs b/src/Adapter/MSTestAdapter.PlatformServices/Deployment/DeploymentItem.cs
index f9a74383aa..e041ce0d32 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Deployment/DeploymentItem.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Deployment/DeploymentItem.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if !WINDOWS_UWP
-using System.Globalization;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Deployment/TestRunDirectories.cs b/src/Adapter/MSTestAdapter.PlatformServices/Deployment/TestRunDirectories.cs
index db0a583a89..b7a07ea77d 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Deployment/TestRunDirectories.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Deployment/TestRunDirectories.cs
@@ -3,8 +3,6 @@
#if !WINDOWS_UWP
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Interfaces/IReflectionOperations.cs b/src/Adapter/MSTestAdapter.PlatformServices/Interfaces/IReflectionOperations.cs
index 6d45ad9137..eb93885e4a 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Interfaces/IReflectionOperations.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Interfaces/IReflectionOperations.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
///
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Interfaces/ITestSourceHost.cs b/src/Adapter/MSTestAdapter.PlatformServices/Interfaces/ITestSourceHost.cs
index 9d2f93a7b5..93a3157526 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Interfaces/ITestSourceHost.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Interfaces/ITestSourceHost.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
///
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/RecursiveDirectoryPath.cs b/src/Adapter/MSTestAdapter.PlatformServices/RecursiveDirectoryPath.cs
index 93f712ca1c..e2dbebb62f 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/RecursiveDirectoryPath.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/RecursiveDirectoryPath.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if !WINDOWS_UWP
-using System.Diagnostics.CodeAnalysis;
using System.Security;
namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Services/ExecutionContextService.cs b/src/Adapter/MSTestAdapter.PlatformServices/Services/ExecutionContextService.cs
index c38800d1c0..10426cf024 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Services/ExecutionContextService.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Services/ExecutionContextService.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Concurrent;
-using System.Diagnostics;
namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Services/MSTestAdapterSettings.cs b/src/Adapter/MSTestAdapter.PlatformServices/Services/MSTestAdapterSettings.cs
index 59ac48a834..a71a4322ba 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Services/MSTestAdapterSettings.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Services/MSTestAdapterSettings.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if !WINDOWS_UWP
-using System.Globalization;
-using System.Xml;
using Microsoft.Testing.Platform.Configurations;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Services/ReflectionOperations.cs b/src/Adapter/MSTestAdapter.PlatformServices/Services/ReflectionOperations.cs
index f927fd9137..f72e120267 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Services/ReflectionOperations.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Services/ReflectionOperations.cs
@@ -1,12 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#if !NETFRAMEWORK
-using System.Diagnostics;
-#endif
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
#if NETFRAMEWORK
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Services/SettingsProvider.cs b/src/Adapter/MSTestAdapter.PlatformServices/Services/SettingsProvider.cs
index 618229553b..6775530711 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Services/SettingsProvider.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Services/SettingsProvider.cs
@@ -1,11 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#if !WINDOWS_UWP
-using System.Diagnostics.CodeAnalysis;
-#endif
-using System.Xml;
-
using Microsoft.Testing.Platform.Configurations;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Services/TestContextImplementation.cs b/src/Adapter/MSTestAdapter.PlatformServices/Services/TestContextImplementation.cs
index 010994cdc4..2b63f2a3eb 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Services/TestContextImplementation.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Services/TestContextImplementation.cs
@@ -6,7 +6,6 @@
using System.Data;
using System.Data.Common;
#endif
-using System.Globalization;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Services/TestDataSource.cs b/src/Adapter/MSTestAdapter.PlatformServices/Services/TestDataSource.cs
index da68aed004..232dc8d19b 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Services/TestDataSource.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Services/TestDataSource.cs
@@ -4,8 +4,6 @@
#if NETFRAMEWORK
using System.Configuration;
using System.Data;
-using System.Diagnostics;
-using System.Globalization;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Data;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Extensions;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Services/TestDeployment.cs b/src/Adapter/MSTestAdapter.PlatformServices/Services/TestDeployment.cs
index 142cbe85d6..257f02d895 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Services/TestDeployment.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Services/TestDeployment.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
#if !WINDOWS_UWP
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
#endif
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Services/TestSourceHost.cs b/src/Adapter/MSTestAdapter.PlatformServices/Services/TestSourceHost.cs
index 3947aae28b..441b3c7d5d 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Services/TestSourceHost.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Services/TestSourceHost.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
#if NETFRAMEWORK
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Services/TraceListener.cs b/src/Adapter/MSTestAdapter.PlatformServices/Services/TraceListener.cs
index 25196e6784..667fa713c0 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Services/TraceListener.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Services/TraceListener.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#if !WINDOWS_UWP && !WIN_UI
-using System.Diagnostics;
-#endif
-
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Services/TraceListenerManager.cs b/src/Adapter/MSTestAdapter.PlatformServices/Services/TraceListenerManager.cs
index 7aa3dcbd53..0eec6af8f1 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Services/TraceListenerManager.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Services/TraceListenerManager.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#if !WINDOWS_UWP && !WIN_UI
-using System.Diagnostics;
-#endif
-
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/AppDomainUtilities.cs b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/AppDomainUtilities.cs
index a465deaebc..f76a25f500 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/AppDomainUtilities.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/AppDomainUtilities.cs
@@ -3,10 +3,6 @@
#if NETFRAMEWORK
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/ApplicationStateGuard.cs b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/ApplicationStateGuard.cs
index 1028c8e7da..8e27eec703 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/ApplicationStateGuard.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/ApplicationStateGuard.cs
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;
namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/AssemblyUtility.cs b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/AssemblyUtility.cs
index 1c36284b18..18ddbf8cd5 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/AssemblyUtility.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/AssemblyUtility.cs
@@ -3,11 +3,7 @@
#if !WINDOWS_UWP
-using System.Diagnostics.CodeAnalysis;
#if NETFRAMEWORK
-using System.Diagnostics;
-using System.Globalization;
-using System.Reflection;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentItemUtility.cs b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentItemUtility.cs
index 07479ffe20..ecec3bd786 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentItemUtility.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentItemUtility.cs
@@ -4,9 +4,6 @@
#if !WINDOWS_UWP
using System.Collections;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentUtility.cs b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentUtility.cs
index 51c73227b0..e64336180e 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentUtility.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentUtility.cs
@@ -3,10 +3,6 @@
#if !WINDOWS_UWP
-#if NETFRAMEWORK || NETSTANDARD || NETCOREAPP3_1
-using System.Diagnostics;
-#endif
-using System.Globalization;
#if NETFRAMEWORK
using System.Security;
#endif
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentUtilityBase.cs b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentUtilityBase.cs
index 0fbcabc78e..a63aa0656a 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentUtilityBase.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/DeploymentUtilityBase.cs
@@ -3,9 +3,6 @@
#if !WINDOWS_UWP
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Extensions;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/FileUtility.cs b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/FileUtility.cs
index 708fff0ec5..f97005e844 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/FileUtility.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/FileUtility.cs
@@ -3,9 +3,6 @@
#if !WINDOWS_UWP
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Extensions;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/ReflectionUtility.cs b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/ReflectionUtility.cs
index 8ff05ead97..15962c5555 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/ReflectionUtility.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/ReflectionUtility.cs
@@ -6,8 +6,6 @@
#if NETFRAMEWORK
using System.Collections;
#endif
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/VSInstallationUtilities.cs b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/VSInstallationUtilities.cs
index 0a16f5e3f4..519255dd0b 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/VSInstallationUtilities.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/VSInstallationUtilities.cs
@@ -3,7 +3,6 @@
#if NETFRAMEWORK
-using System.Diagnostics;
using System.Runtime.InteropServices;
using static System.String;
diff --git a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/XmlUtilities.cs b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/XmlUtilities.cs
index 3518df09ed..6c23bce1db 100644
--- a/src/Adapter/MSTestAdapter.PlatformServices/Utilities/XmlUtilities.cs
+++ b/src/Adapter/MSTestAdapter.PlatformServices/Utilities/XmlUtilities.cs
@@ -3,12 +3,6 @@
#if NETFRAMEWORK
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-using System.Text;
-using System.Xml;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
diff --git a/src/Analyzers/MSTest.Analyzers.CodeFixes/UseProperAssertMethodsFixer.cs b/src/Analyzers/MSTest.Analyzers.CodeFixes/UseProperAssertMethodsFixer.cs
index 9350d06abf..d8dfaf8a42 100644
--- a/src/Analyzers/MSTest.Analyzers.CodeFixes/UseProperAssertMethodsFixer.cs
+++ b/src/Analyzers/MSTest.Analyzers.CodeFixes/UseProperAssertMethodsFixer.cs
@@ -3,8 +3,6 @@
using System.Collections.Immutable;
using System.Composition;
-using System.Diagnostics;
-using System.Globalization;
using Analyzer.Utilities;
diff --git a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/ArrayBuilder.cs b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/ArrayBuilder.cs
index 81c3fb5952..56f52cc18e 100644
--- a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/ArrayBuilder.cs
+++ b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/ArrayBuilder.cs
@@ -2,7 +2,6 @@
using System.Collections;
using System.Collections.Immutable;
-using System.Diagnostics;
#pragma warning disable CA1000 // Do not declare static members on generic types
diff --git a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/CompilationExtensions.cs b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/CompilationExtensions.cs
index 283a392d83..e740b609c9 100644
--- a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/CompilationExtensions.cs
+++ b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/CompilationExtensions.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.CodeAnalysis;
namespace Analyzer.Utilities.Extensions;
diff --git a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/IMethodSymbolExtensions.cs b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/IMethodSymbolExtensions.cs
index 949e91704d..e308c35b21 100644
--- a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/IMethodSymbolExtensions.cs
+++ b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/IMethodSymbolExtensions.cs
@@ -2,8 +2,6 @@
#nullable disable warnings
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.CodeAnalysis;
using MSTest.Analyzers.Helpers;
diff --git a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/IOperationExtensions.cs b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/IOperationExtensions.cs
index 1584ad6d0f..b4f48fb09f 100644
--- a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/IOperationExtensions.cs
+++ b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/IOperationExtensions.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System;
-using System.Collections.Generic;
-using System.Text;
-
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Operations;
diff --git a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/ITypeSymbolExtensions.cs b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/ITypeSymbolExtensions.cs
index dbd736e80a..a76b4c0dc4 100644
--- a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/ITypeSymbolExtensions.cs
+++ b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/ITypeSymbolExtensions.cs
@@ -2,8 +2,6 @@
#nullable disable warnings
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.CodeAnalysis;
namespace Analyzer.Utilities.Extensions;
diff --git a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/ObjectPool.cs b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/ObjectPool.cs
index 6a3a7e88aa..772b399e98 100644
--- a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/ObjectPool.cs
+++ b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/ObjectPool.cs
@@ -10,8 +10,6 @@
// #define DETECT_LEAKS //for now always enable DETECT_LEAKS in debug.
// #endif
-using System.Diagnostics;
-
#if DETECT_LEAKS
using System.Runtime.CompilerServices;
diff --git a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/PerformanceSensitiveAttribute.cs b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/PerformanceSensitiveAttribute.cs
index 2f753bdefb..0fe718cff9 100644
--- a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/PerformanceSensitiveAttribute.cs
+++ b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/PerformanceSensitiveAttribute.cs
@@ -4,7 +4,6 @@
#pragma warning disable CS1574 // XML comment has cref attribute that could not be resolved (not all builds have all types)
using System;
-using System.Diagnostics;
namespace Roslyn.Utilities
{
diff --git a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/PooledHashSet.cs b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/PooledHashSet.cs
index 8adfb81f78..85b764e176 100644
--- a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/PooledHashSet.cs
+++ b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/PooledHashSet.cs
@@ -2,7 +2,6 @@
using System.Collections.Concurrent;
using System.Collections.Immutable;
-using System.Diagnostics;
#pragma warning disable CA1000 // Do not declare static members on generic types
diff --git a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/RoslynDebug.cs b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/RoslynDebug.cs
index 8a70ae87aa..948329696f 100644
--- a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/RoslynDebug.cs
+++ b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/RoslynDebug.cs
@@ -1,8 +1,5 @@
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the MIT license. See License.txt in the project root for license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-
namespace Analyzer.Utilities;
internal static class RoslynDebug
diff --git a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/WellKnownTypeProvider.cs b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/WellKnownTypeProvider.cs
index f988d950c2..8a3db1b62c 100644
--- a/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/WellKnownTypeProvider.cs
+++ b/src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/WellKnownTypeProvider.cs
@@ -2,8 +2,6 @@
using System.Collections.Concurrent;
using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
using Analyzer.Utilities.Extensions;
using Analyzer.Utilities.PooledObjects;
diff --git a/src/Analyzers/MSTest.Analyzers/UseProperAssertMethodsAnalyzer.cs b/src/Analyzers/MSTest.Analyzers/UseProperAssertMethodsAnalyzer.cs
index f76566038a..c82f67fc1d 100644
--- a/src/Analyzers/MSTest.Analyzers/UseProperAssertMethodsAnalyzer.cs
+++ b/src/Analyzers/MSTest.Analyzers/UseProperAssertMethodsAnalyzer.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
using Analyzer.Utilities;
using Analyzer.Utilities.Extensions;
diff --git a/src/Analyzers/MSTest.Internal.Analyzers/MSTestObsoleteTypesSuppressor.cs b/src/Analyzers/MSTest.Internal.Analyzers/MSTestObsoleteTypesSuppressor.cs
index 2474a61e66..a844a1ee92 100644
--- a/src/Analyzers/MSTest.Internal.Analyzers/MSTestObsoleteTypesSuppressor.cs
+++ b/src/Analyzers/MSTest.Internal.Analyzers/MSTestObsoleteTypesSuppressor.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Immutable;
-using System.Globalization;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Diagnostics;
diff --git a/src/Platform/Microsoft.Testing.Extensions.CrashDump/CrashDumpCommandLineProvider.cs b/src/Platform/Microsoft.Testing.Extensions.CrashDump/CrashDumpCommandLineProvider.cs
index 7bed8e2ec8..195136e80c 100644
--- a/src/Platform/Microsoft.Testing.Extensions.CrashDump/CrashDumpCommandLineProvider.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.CrashDump/CrashDumpCommandLineProvider.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.Diagnostics.Resources;
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions;
diff --git a/src/Platform/Microsoft.Testing.Extensions.CrashDump/CrashDumpProcessLifetimeHandler.cs b/src/Platform/Microsoft.Testing.Extensions.CrashDump/CrashDumpProcessLifetimeHandler.cs
index 8c92fc9a91..ecec7a268e 100644
--- a/src/Platform/Microsoft.Testing.Extensions.CrashDump/CrashDumpProcessLifetimeHandler.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.CrashDump/CrashDumpProcessLifetimeHandler.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.Diagnostics.Resources;
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions.Messages;
diff --git a/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpActivityIndicator.cs b/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpActivityIndicator.cs
index aeff5caa2a..7716ce3c20 100644
--- a/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpActivityIndicator.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpActivityIndicator.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Concurrent;
-using System.Globalization;
using Microsoft.Testing.Extensions.Diagnostics.Resources;
using Microsoft.Testing.Extensions.HangDump.Serializers;
diff --git a/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpCommandLineProvider.cs b/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpCommandLineProvider.cs
index 823de1e328..b69d97480a 100644
--- a/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpCommandLineProvider.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpCommandLineProvider.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.Diagnostics.Resources;
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions;
diff --git a/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpEnvironmentVariableProvider.cs b/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpEnvironmentVariableProvider.cs
index 6c855167bf..dd31977754 100644
--- a/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpEnvironmentVariableProvider.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpEnvironmentVariableProvider.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.Diagnostics.Resources;
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions;
diff --git a/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpProcessLifetimeHandler.cs b/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpProcessLifetimeHandler.cs
index 077c7ae384..6987485455 100644
--- a/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpProcessLifetimeHandler.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.HangDump/HangDumpProcessLifetimeHandler.cs
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
#if NETCOREAPP
using System.Runtime.InteropServices;
#endif
diff --git a/src/Platform/Microsoft.Testing.Extensions.HangDump/Helpers/FNV1HashHelper.cs b/src/Platform/Microsoft.Testing.Extensions.HangDump/Helpers/FNV1HashHelper.cs
index 26d5b0ea80..6063f65d9d 100644
--- a/src/Platform/Microsoft.Testing.Extensions.HangDump/Helpers/FNV1HashHelper.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.HangDump/Helpers/FNV1HashHelper.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Helpers;
[ExcludeFromCodeCoverage]
diff --git a/src/Platform/Microsoft.Testing.Extensions.HangDump/WindowsMiniDumpWriteDump.cs b/src/Platform/Microsoft.Testing.Extensions.HangDump/WindowsMiniDumpWriteDump.cs
index 7217148459..03ef647d6f 100644
--- a/src/Platform/Microsoft.Testing.Extensions.HangDump/WindowsMiniDumpWriteDump.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.HangDump/WindowsMiniDumpWriteDump.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
using Microsoft.Win32.SafeHandles;
diff --git a/src/Platform/Microsoft.Testing.Extensions.MSBuild/MSBuildConsumer.cs b/src/Platform/Microsoft.Testing.Extensions.MSBuild/MSBuildConsumer.cs
index d46dbd47a5..affdffe07a 100644
--- a/src/Platform/Microsoft.Testing.Extensions.MSBuild/MSBuildConsumer.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.MSBuild/MSBuildConsumer.cs
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
using System.Text;
using Microsoft.Testing.Extensions.MSBuild.Serializers;
diff --git a/src/Platform/Microsoft.Testing.Extensions.Retry/RetryCommandLineOptionsProvider.cs b/src/Platform/Microsoft.Testing.Extensions.Retry/RetryCommandLineOptionsProvider.cs
index 40ee1ac50d..954fb4dfe9 100644
--- a/src/Platform/Microsoft.Testing.Extensions.Retry/RetryCommandLineOptionsProvider.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.Retry/RetryCommandLineOptionsProvider.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under dual-license. See LICENSE.PLATFORMTOOLS.txt file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.Policy.Resources;
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions;
diff --git a/src/Platform/Microsoft.Testing.Extensions.Retry/RetryOrchestrator.cs b/src/Platform/Microsoft.Testing.Extensions.Retry/RetryOrchestrator.cs
index 849d286da2..219bf3121d 100644
--- a/src/Platform/Microsoft.Testing.Extensions.Retry/RetryOrchestrator.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.Retry/RetryOrchestrator.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under dual-license. See LICENSE.PLATFORMTOOLS.txt file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-
using Microsoft.Testing.Extensions.Policy.Resources;
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Configurations;
diff --git a/src/Platform/Microsoft.Testing.Extensions.Telemetry/AppInsightsProvider.cs b/src/Platform/Microsoft.Testing.Extensions.Telemetry/AppInsightsProvider.cs
index fc69d13e19..9c66f439c2 100644
--- a/src/Platform/Microsoft.Testing.Extensions.Telemetry/AppInsightsProvider.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.Telemetry/AppInsightsProvider.cs
@@ -6,7 +6,6 @@
#else
using System.Collections.Concurrent;
#endif
-using System.Globalization;
using System.Text;
using Microsoft.Testing.Platform;
diff --git a/src/Platform/Microsoft.Testing.Extensions.TrxReport.Abstractions/GlobalSuppressions.cs b/src/Platform/Microsoft.Testing.Extensions.TrxReport.Abstractions/GlobalSuppressions.cs
index 91e972bf72..c51ba7e88d 100644
--- a/src/Platform/Microsoft.Testing.Extensions.TrxReport.Abstractions/GlobalSuppressions.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.TrxReport.Abstractions/GlobalSuppressions.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
// We usually do not want to suppress issues through GlobalSuppressions file but in this case we have to do it because
// we are not able to suppress the issue differently.
#pragma warning disable IDE0076
diff --git a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxCompareTool.CommandLine.cs b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxCompareTool.CommandLine.cs
index 71f2f4b9c5..05b2a63ed4 100644
--- a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxCompareTool.CommandLine.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxCompareTool.CommandLine.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.TestReports.Resources;
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions;
diff --git a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxCompareTool.cs b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxCompareTool.cs
index 3078a918f2..f5eaca9b5a 100644
--- a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxCompareTool.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxCompareTool.cs
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
using System.Text;
using System.Xml.Linq;
diff --git a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxDataConsumer.cs b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxDataConsumer.cs
index f7b963c788..b8359cfd8d 100644
--- a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxDataConsumer.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxDataConsumer.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.TestReports.Resources;
using Microsoft.Testing.Extensions.TrxReport.Abstractions.Serializers;
using Microsoft.Testing.Platform.Capabilities.TestFramework;
diff --git a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxEnvironmentVariableProvider.cs b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxEnvironmentVariableProvider.cs
index d19aa3f54e..9663d49ce9 100644
--- a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxEnvironmentVariableProvider.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxEnvironmentVariableProvider.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.TestReports.Resources;
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions;
diff --git a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxProcessLifetimeHandler.cs b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxProcessLifetimeHandler.cs
index 3ecf341949..c73914056f 100644
--- a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxProcessLifetimeHandler.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxProcessLifetimeHandler.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.TestReports.Resources;
using Microsoft.Testing.Extensions.TrxReport.Abstractions.Serializers;
using Microsoft.Testing.Platform.CommandLine;
diff --git a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxReportEngine.cs b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxReportEngine.cs
index 79a64331c9..69bfe0e92f 100644
--- a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxReportEngine.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxReportEngine.cs
@@ -4,10 +4,7 @@
#if NETCOREAPP
using System.Buffers;
#endif
-using System.Globalization;
using System.Security.Cryptography;
-using System.Text;
-using System.Text.RegularExpressions;
using System.Xml.Linq;
using Microsoft.Testing.Platform.CommandLine;
diff --git a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxTestApplicationLifecycleCallbacks.cs b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxTestApplicationLifecycleCallbacks.cs
index 9102eeaa8e..33e0e73cff 100644
--- a/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxTestApplicationLifecycleCallbacks.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.TrxReport/TrxTestApplicationLifecycleCallbacks.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.TestReports.Resources;
using Microsoft.Testing.Extensions.TrxReport.Abstractions.Serializers;
using Microsoft.Testing.Platform.CommandLine;
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/CommandLine/RunSettingsCommandLineOptionsProvider.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/CommandLine/RunSettingsCommandLineOptionsProvider.cs
index dad26b9207..261f1e58d5 100644
--- a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/CommandLine/RunSettingsCommandLineOptionsProvider.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/CommandLine/RunSettingsCommandLineOptionsProvider.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.VSTestBridge.Resources;
using Microsoft.Testing.Platform;
using Microsoft.Testing.Platform.CommandLine;
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/CommandLine/TestRunParametersCommandLineOptionsProvider.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/CommandLine/TestRunParametersCommandLineOptionsProvider.cs
index 1646d8df09..174f2022c8 100644
--- a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/CommandLine/TestRunParametersCommandLineOptionsProvider.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/CommandLine/TestRunParametersCommandLineOptionsProvider.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.VSTestBridge.Resources;
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions;
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Helpers/DebugUtils.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Helpers/DebugUtils.cs
index 57724e17e4..7801f753b1 100644
--- a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Helpers/DebugUtils.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Helpers/DebugUtils.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
namespace Microsoft.Testing.Extensions.VSTestBridge.Helpers;
internal static class DebugUtils
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/Condition.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/Condition.cs
index 3cdfd97863..90d9101af0 100644
--- a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/Condition.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/Condition.cs
@@ -2,10 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// NOTE: This file is copied as-is from VSTest source code.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-
using Microsoft.Testing.Platform;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/ContextAdapterBase.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/ContextAdapterBase.cs
index 4d8a44bbee..e79410734a 100644
--- a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/ContextAdapterBase.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/ContextAdapterBase.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.VSTestBridge.CommandLine;
using Microsoft.Testing.Platform;
using Microsoft.Testing.Platform.CommandLine;
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FastFilter.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FastFilter.cs
index 3e0ec2232c..456384b72c 100644
--- a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FastFilter.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FastFilter.cs
@@ -3,9 +3,6 @@
// NOTE: This file is copied as-is from VSTest source code.
using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text.RegularExpressions;
using Microsoft.Testing.Platform;
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FilterExpression.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FilterExpression.cs
index 53531b3d83..4f771bfc0f 100644
--- a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FilterExpression.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FilterExpression.cs
@@ -2,12 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// NOTE: This file is copied as-is from VSTest source code.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Text.RegularExpressions;
-
using Microsoft.Testing.Platform;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FilterExpressionWrapper.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FilterExpressionWrapper.cs
index 14cde5cba7..3b8e083a14 100644
--- a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FilterExpressionWrapper.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FilterExpressionWrapper.cs
@@ -2,9 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// NOTE: This file is copied as-is from VSTest source code.
-using System.Diagnostics.CodeAnalysis;
-using System.Text.RegularExpressions;
-
using Microsoft.Testing.Platform;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/ObjectModelConverters.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/ObjectModelConverters.cs
index 81a3151552..76bc0af8cb 100644
--- a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/ObjectModelConverters.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/ObjectModelConverters.cs
@@ -3,8 +3,6 @@
#pragma warning disable TPEXP // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.Testing.Extensions.TrxReport.Abstractions;
using Microsoft.Testing.Platform;
using Microsoft.Testing.Platform.Extensions.Messages;
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/RunContextAdapter.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/RunContextAdapter.cs
index 3b321ef613..9402ebf4f0 100644
--- a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/RunContextAdapter.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/RunContextAdapter.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Text;
using System.Xml.Linq;
using Microsoft.Testing.Platform;
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/RunSettingsAdapter.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/RunSettingsAdapter.cs
index 9e63be64bc..e45dbb6a94 100644
--- a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/RunSettingsAdapter.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/RunSettingsAdapter.cs
@@ -3,7 +3,6 @@
#pragma warning disable TPEXP // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-using System.Globalization;
using System.Xml.Linq;
using Microsoft.Testing.Extensions.VSTestBridge.CommandLine;
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/SynchronizedSingleSessionVSTestAndTestAnywhereAdapter.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/SynchronizedSingleSessionVSTestAndTestAnywhereAdapter.cs
index 7cfbe47606..17ddf43eff 100644
--- a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/SynchronizedSingleSessionVSTestAndTestAnywhereAdapter.cs
+++ b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/SynchronizedSingleSessionVSTestAndTestAnywhereAdapter.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.Testing.Extensions.VSTestBridge.Requests;
using Microsoft.Testing.Extensions.VSTestBridge.Resources;
using Microsoft.Testing.Platform.Capabilities.TestFramework;
diff --git a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/DotnetMuxerLocator.cs b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/DotnetMuxerLocator.cs
index 53ca25c7d6..7a371e3217 100644
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/DotnetMuxerLocator.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/DotnetMuxerLocator.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// Adapted from https://github.com/microsoft/vstest/blob/main/src/Microsoft.TestPlatform.CoreUtilities/Helpers/DotnetHostHelper.cs
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
using Microsoft.Win32;
diff --git a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/FailedTestHelper.cs b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/FailedTestHelper.cs
index 14a8e0fad6..a344ed461d 100644
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/FailedTestHelper.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/FailedTestHelper.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Text;
-
using Microsoft.Testing.Extensions.MSBuild.Serializers;
namespace Microsoft.Testing.Platform.MSBuild;
diff --git a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/InvokeTestingPlatformTask.cs b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/InvokeTestingPlatformTask.cs
index fbebc18061..a407292b7d 100644
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/InvokeTestingPlatformTask.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/InvokeTestingPlatformTask.cs
@@ -3,10 +3,7 @@
#pragma warning disable CS8618 // Properties below are set by MSBuild.
-using System.Diagnostics;
-using System.Globalization;
using System.Runtime.InteropServices;
-using System.Text;
using Microsoft.Build.Framework;
using Microsoft.Testing.Extensions.MSBuild;
diff --git a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/MSBuildCompatibilityHelper.cs b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/MSBuildCompatibilityHelper.cs
index 5d96eb1bf9..8edc1432e8 100644
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/MSBuildCompatibilityHelper.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/MSBuildCompatibilityHelper.cs
@@ -3,8 +3,6 @@
#pragma warning disable CS8618 // Properties below are set by MSBuild.
-using System.Reflection;
-
using Microsoft.Build.Framework;
namespace Microsoft.Testing.Platform.MSBuild;
diff --git a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/StackTraceHelper.cs b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/StackTraceHelper.cs
index e4f936f99a..bb2c276601 100644
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/StackTraceHelper.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/StackTraceHelper.cs
@@ -1,11 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-using System.Text.RegularExpressions;
-
namespace Microsoft.Testing.Platform.MSBuild;
internal static class StackTraceHelper
diff --git a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/TestingPlatformAutoRegisteredExtensions.cs b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/TestingPlatformAutoRegisteredExtensions.cs
index a1ce5ff9df..9b0bf36e79 100644
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/TestingPlatformAutoRegisteredExtensions.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/TestingPlatformAutoRegisteredExtensions.cs
@@ -3,10 +3,6 @@
#pragma warning disable CS8618 // Properties below are set by MSBuild.
-using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
diff --git a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/TestingPlatformEntryPointTask.cs b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/TestingPlatformEntryPointTask.cs
index d8ddd2b51a..ec44b532d6 100644
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/TestingPlatformEntryPointTask.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/TestingPlatformEntryPointTask.cs
@@ -3,8 +3,6 @@
#pragma warning disable CS8618 // Properties below are set by MSBuild.
-using System.Diagnostics;
-
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;
diff --git a/src/Platform/Microsoft.Testing.Platform/Builder/TestApplication.cs b/src/Platform/Microsoft.Testing.Platform/Builder/TestApplication.cs
index 7b618018a9..1c88c1a4ca 100644
--- a/src/Platform/Microsoft.Testing.Platform/Builder/TestApplication.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Builder/TestApplication.cs
@@ -1,14 +1,10 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
-using System.Reflection;
#if NETCOREAPP
using System.Runtime.CompilerServices;
#endif
using System.Runtime.InteropServices;
-using System.Text;
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Configurations;
diff --git a/src/Platform/Microsoft.Testing.Platform/Capabilities/TestFramework/IBannerMessageOwnerCapability.cs b/src/Platform/Microsoft.Testing.Platform/Capabilities/TestFramework/IBannerMessageOwnerCapability.cs
index 13f0fb4571..97f4c19d24 100644
--- a/src/Platform/Microsoft.Testing.Platform/Capabilities/TestFramework/IBannerMessageOwnerCapability.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Capabilities/TestFramework/IBannerMessageOwnerCapability.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Capabilities.TestFramework;
///
diff --git a/src/Platform/Microsoft.Testing.Platform/Capabilities/TestFramework/IGracefulStopTestExecutionCapability.cs b/src/Platform/Microsoft.Testing.Platform/Capabilities/TestFramework/IGracefulStopTestExecutionCapability.cs
index ee8a92dee3..d152211c28 100644
--- a/src/Platform/Microsoft.Testing.Platform/Capabilities/TestFramework/IGracefulStopTestExecutionCapability.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Capabilities/TestFramework/IGracefulStopTestExecutionCapability.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Capabilities.TestFramework;
///
diff --git a/src/Platform/Microsoft.Testing.Platform/Capabilities/TestFramework/TestFrameworkCapabilitiesExtensions.cs b/src/Platform/Microsoft.Testing.Platform/Capabilities/TestFramework/TestFrameworkCapabilitiesExtensions.cs
index 4c934c097c..69d3d4c90f 100644
--- a/src/Platform/Microsoft.Testing.Platform/Capabilities/TestFramework/TestFrameworkCapabilitiesExtensions.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Capabilities/TestFramework/TestFrameworkCapabilitiesExtensions.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Capabilities.TestFramework;
[Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineHandler.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineHandler.cs
index 6ab0710778..528f5eb63a 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineHandler.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineHandler.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
using System.Runtime.InteropServices;
using Microsoft.Testing.Platform.Extensions.CommandLine;
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOption.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOption.cs
index aa3cf47b5e..2db11713d0 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOption.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOption.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
-
using Microsoft.Testing.Platform.Helpers;
using Microsoft.Testing.Platform.Resources;
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOptionsProxy.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOptionsProxy.cs
index 6ec2f8f7d7..ee83a5664e 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOptionsProxy.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOptionsProxy.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.CommandLine;
internal sealed class CommandLineOptionsProxy : ICommandLineOptions
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOptionsValidator.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOptionsValidator.cs
index 3449c90813..aa67608816 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOptionsValidator.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/CommandLineOptionsValidator.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Text;
-
using Microsoft.Testing.Platform.Extensions;
using Microsoft.Testing.Platform.Extensions.CommandLine;
using Microsoft.Testing.Platform.Helpers;
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/ICommandLineManager.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/ICommandLineManager.cs
index 9865b5e69f..481bd37a20 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/ICommandLineManager.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/ICommandLineManager.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.Testing.Platform.Extensions.CommandLine;
namespace Microsoft.Testing.Platform.CommandLine;
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/ICommandLineOptions.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/ICommandLineOptions.cs
index 30abc03a5e..bfb1e2455b 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/ICommandLineOptions.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/ICommandLineOptions.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.CommandLine;
///
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/MaxFailedTestsCommandLineOptionsProvider.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/MaxFailedTestsCommandLineOptionsProvider.cs
index bf8842c405..4d4878b34d 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/MaxFailedTestsCommandLineOptionsProvider.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/MaxFailedTestsCommandLineOptionsProvider.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.Capabilities.TestFramework;
using Microsoft.Testing.Platform.Extensions;
using Microsoft.Testing.Platform.Extensions.CommandLine;
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/ParseResult.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/ParseResult.cs
index eb4f7a79a5..a95ccc9e83 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/ParseResult.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/ParseResult.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-
namespace Microsoft.Testing.Platform.CommandLine;
internal sealed class CommandLineParseResult(string? toolName, IReadOnlyList options, IReadOnlyList errors) : IEquatable
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/Parser.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/Parser.cs
index b3d03c6b6f..ed1bf536d1 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/Parser.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/Parser.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.Helpers;
using Microsoft.Testing.Platform.Resources;
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/PlatformCommandLineProvider.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/PlatformCommandLineProvider.cs
index ba26ab2f22..557efac8e0 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/PlatformCommandLineProvider.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/PlatformCommandLineProvider.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
-
using Microsoft.Testing.Platform.Extensions;
using Microsoft.Testing.Platform.Extensions.CommandLine;
using Microsoft.Testing.Platform.Helpers;
diff --git a/src/Platform/Microsoft.Testing.Platform/CommandLine/ResponseFileHelper.cs b/src/Platform/Microsoft.Testing.Platform/CommandLine/ResponseFileHelper.cs
index 6b4d9979c9..ff9a0b029f 100644
--- a/src/Platform/Microsoft.Testing.Platform/CommandLine/ResponseFileHelper.cs
+++ b/src/Platform/Microsoft.Testing.Platform/CommandLine/ResponseFileHelper.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
using Microsoft.Testing.Platform.Resources;
// Most of the core logic is from:
diff --git a/src/Platform/Microsoft.Testing.Platform/Configurations/EnvironmentVariablesConfigurationProvider.cs b/src/Platform/Microsoft.Testing.Platform/Configurations/EnvironmentVariablesConfigurationProvider.cs
index 07808c30aa..6b03bf0809 100644
--- a/src/Platform/Microsoft.Testing.Platform/Configurations/EnvironmentVariablesConfigurationProvider.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Configurations/EnvironmentVariablesConfigurationProvider.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections;
-using System.Diagnostics.CodeAnalysis;
using Microsoft.Testing.Platform.Helpers;
diff --git a/src/Platform/Microsoft.Testing.Platform/Configurations/JsonConfigurationFileParser.cs b/src/Platform/Microsoft.Testing.Platform/Configurations/JsonConfigurationFileParser.cs
index 5583122c4d..65a7f2a870 100644
--- a/src/Platform/Microsoft.Testing.Platform/Configurations/JsonConfigurationFileParser.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Configurations/JsonConfigurationFileParser.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
using System.Text.Json;
using Microsoft.Testing.Platform.Resources;
diff --git a/src/Platform/Microsoft.Testing.Platform/Configurations/JsonConfigurationFileParser.netstandard.cs b/src/Platform/Microsoft.Testing.Platform/Configurations/JsonConfigurationFileParser.netstandard.cs
index 74b89b15e0..3d21acc89f 100644
--- a/src/Platform/Microsoft.Testing.Platform/Configurations/JsonConfigurationFileParser.netstandard.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Configurations/JsonConfigurationFileParser.netstandard.cs
@@ -3,8 +3,6 @@
#if !NETCOREAPP
-using System.Globalization;
-
using Jsonite;
using Microsoft.Testing.Platform.Resources;
diff --git a/src/Platform/Microsoft.Testing.Platform/Configurations/JsonConfigurationProvider.cs b/src/Platform/Microsoft.Testing.Platform/Configurations/JsonConfigurationProvider.cs
index 5857586520..600d5232a7 100644
--- a/src/Platform/Microsoft.Testing.Platform/Configurations/JsonConfigurationProvider.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Configurations/JsonConfigurationProvider.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Helpers;
using Microsoft.Testing.Platform.Logging;
diff --git a/src/Platform/Microsoft.Testing.Platform/Extensions/ValidationResult.cs b/src/Platform/Microsoft.Testing.Platform/Extensions/ValidationResult.cs
index f1161cfbc3..5b3a1e7f0b 100644
--- a/src/Platform/Microsoft.Testing.Platform/Extensions/ValidationResult.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Extensions/ValidationResult.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Extensions;
///
diff --git a/src/Platform/Microsoft.Testing.Platform/GlobalSuppressions.cs b/src/Platform/Microsoft.Testing.Platform/GlobalSuppressions.cs
index 6e70346b51..a4f5d1ba6f 100644
--- a/src/Platform/Microsoft.Testing.Platform/GlobalSuppressions.cs
+++ b/src/Platform/Microsoft.Testing.Platform/GlobalSuppressions.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
// We usually do not want to suppress issues through GlobalSuppressions file but in this case we have to do it because
// we are not able to suppress the issue differently.
#pragma warning disable IDE0076
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/ActionResult.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/ActionResult.cs
index 6f1407d5be..4e8ea92035 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/ActionResult.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/ActionResult.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Helpers;
internal class ActionResult
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/ApplicationStateGuard.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/ApplicationStateGuard.cs
index 49b361b7cc..0ce1f9ab0d 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/ApplicationStateGuard.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/ApplicationStateGuard.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
using System.Runtime.CompilerServices;
#if !PLATFORM_MSBUILD
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/ArgumentGuard.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/ArgumentGuard.cs
index a22e2ad75c..b47f0bfe9e 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/ArgumentGuard.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/ArgumentGuard.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Helpers;
internal static class ArgumentGuard
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/EnvironmentVariableConstants.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/EnvironmentVariableConstants.cs
index a08556f301..a5a971b4c0 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/EnvironmentVariableConstants.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/EnvironmentVariableConstants.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Helpers;
[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1310:Field names should not contain underscore", Justification = "Use nameof pattern")]
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/NonCooperativeParentProcessListener.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/NonCooperativeParentProcessListener.cs
index 75e7b77b3a..040ed07481 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/NonCooperativeParentProcessListener.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/NonCooperativeParentProcessListener.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
-
using Microsoft.Testing.Platform.CommandLine;
namespace Microsoft.Testing.Platform.Helpers;
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/ObjectPool.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/ObjectPool.cs
index 38dc4a7530..7a38b4e3a6 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/ObjectPool.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/ObjectPool.cs
@@ -13,9 +13,6 @@
// #define DETECT_LEAKS //for now always enable DETECT_LEAKS in debug.
// #endif
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-
#if DETECT_LEAKS
using System.Runtime.CompilerServices;
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/RoslynDebug.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/RoslynDebug.cs
index 59940b9ff3..63e4afa6de 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/RoslynDebug.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/RoslynDebug.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-
// Copied from https://github.com/dotnet/roslyn-analyzers/blob/main/src/Utilities/Compiler/Debug.cs
namespace Microsoft.Testing.Platform;
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/RoslynHashCode.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/RoslynHashCode.cs
index 681f7d397a..af01d643c0 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/RoslynHashCode.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/RoslynHashCode.cs
@@ -47,7 +47,6 @@ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
*/
using System.ComponentModel;
-using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;
using System.Security.Cryptography;
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/RoslynString.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/RoslynString.cs
index f70cdb5bad..609335384b 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/RoslynString.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/RoslynString.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform;
[SuppressMessage("ApiDesign", "RS0030:Do not use banned APIs", Justification = "This is the replacement helper")]
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/Sha256Hasher.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/Sha256Hasher.cs
index 3966c96b39..99f5c70729 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/Sha256Hasher.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/Sha256Hasher.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 System.Diagnostics.CodeAnalysis;
using System.Security.Cryptography;
-using System.Text;
namespace Microsoft.Testing.Platform.Helpers;
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/System/IProcessHandler.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/System/IProcessHandler.cs
index 2502a9b078..cc5dea6734 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/System/IProcessHandler.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/System/IProcessHandler.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
namespace Microsoft.Testing.Platform.Helpers;
internal interface IProcessHandler
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/System/ITask.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/System/ITask.cs
index b957247835..214fca68bf 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/System/ITask.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/System/ITask.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Helpers;
[SuppressMessage("Style", "VSTHRD200:Use \"Async\" suffix for async methods", Justification = "Match the Task API")]
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemEnvironment.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemEnvironment.cs
index 977d8b52ef..1a78686a34 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemEnvironment.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemEnvironment.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections;
-using System.Diagnostics.CodeAnalysis;
namespace Microsoft.Testing.Platform.Helpers;
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemMainModule.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemMainModule.cs
index 054d72d9d5..e85b8e599e 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemMainModule.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemMainModule.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
namespace Microsoft.Testing.Platform.Helpers;
#if NETCOREAPP
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemProcess.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemProcess.cs
index d33c9c7a54..7c7ed64699 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemProcess.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemProcess.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
namespace Microsoft.Testing.Platform.Helpers;
internal sealed class SystemProcess : IProcess, IDisposable
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemProcessHandler.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemProcessHandler.cs
index 6794651a5c..dbb7589ad8 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemProcessHandler.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemProcessHandler.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
using Microsoft.Testing.Platform.Resources;
namespace Microsoft.Testing.Platform.Helpers;
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemStopwatch.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemStopwatch.cs
index 210513d609..7ce0c0b08a 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemStopwatch.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/System/SystemStopwatch.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
namespace Microsoft.Testing.Platform.Helpers;
internal sealed class SystemStopwatch : IStopwatch
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/TaskExtensions.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/TaskExtensions.cs
index 7ce3974fb7..69de96f068 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/TaskExtensions.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/TaskExtensions.cs
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-// using System.Diagnostics;
using System.Runtime.CompilerServices;
namespace Microsoft.Testing.Platform.Helpers;
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/TestApplicationBuilderExtensions.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/TestApplicationBuilderExtensions.cs
index 247c72a156..6ebc717cdc 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/TestApplicationBuilderExtensions.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/TestApplicationBuilderExtensions.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.Testing.Platform.Builder;
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions;
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/TimeSpanParser.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/TimeSpanParser.cs
index 7208cf0f0f..ffd6a8aea4 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/TimeSpanParser.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/TimeSpanParser.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Text.RegularExpressions;
-
namespace Microsoft.Testing.Platform.Helpers;
internal static partial class TimeSpanParser
diff --git a/src/Platform/Microsoft.Testing.Platform/Helpers/UILanguageOverride.cs b/src/Platform/Microsoft.Testing.Platform/Helpers/UILanguageOverride.cs
index e2244a0f58..4755b34dbb 100644
--- a/src/Platform/Microsoft.Testing.Platform/Helpers/UILanguageOverride.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Helpers/UILanguageOverride.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.Helpers;
namespace Microsoft.Testing.Platform;
diff --git a/src/Platform/Microsoft.Testing.Platform/Hosts/ConsoleTestHost.cs b/src/Platform/Microsoft.Testing.Platform/Hosts/ConsoleTestHost.cs
index 4a66392d2b..026b1365d8 100644
--- a/src/Platform/Microsoft.Testing.Platform/Hosts/ConsoleTestHost.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Hosts/ConsoleTestHost.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
-
using Microsoft.Testing.Internal.Framework;
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions.TestFramework;
diff --git a/src/Platform/Microsoft.Testing.Platform/Hosts/ServerTestHost.cs b/src/Platform/Microsoft.Testing.Platform/Hosts/ServerTestHost.cs
index 78f85cbb46..91a2b94311 100644
--- a/src/Platform/Microsoft.Testing.Platform/Hosts/ServerTestHost.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Hosts/ServerTestHost.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Concurrent;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
using System.Net.Sockets;
using Microsoft.Testing.Internal.Framework;
diff --git a/src/Platform/Microsoft.Testing.Platform/Hosts/TestFrameworkProxy.cs b/src/Platform/Microsoft.Testing.Platform/Hosts/TestFrameworkProxy.cs
index 569bbae639..d48bcb76df 100644
--- a/src/Platform/Microsoft.Testing.Platform/Hosts/TestFrameworkProxy.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Hosts/TestFrameworkProxy.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.Extensions.TestFramework;
using Microsoft.Testing.Platform.Resources;
diff --git a/src/Platform/Microsoft.Testing.Platform/Hosts/TestHostBuilder.cs b/src/Platform/Microsoft.Testing.Platform/Hosts/TestHostBuilder.cs
index 5f27a72103..8fef9136dd 100644
--- a/src/Platform/Microsoft.Testing.Platform/Hosts/TestHostBuilder.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Hosts/TestHostBuilder.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
-using System.Reflection;
using System.Runtime.InteropServices;
using Microsoft.Testing.Internal.Framework;
diff --git a/src/Platform/Microsoft.Testing.Platform/Hosts/TestHostControllersTestHost.cs b/src/Platform/Microsoft.Testing.Platform/Hosts/TestHostControllersTestHost.cs
index 9ee0415152..90bab575d7 100644
--- a/src/Platform/Microsoft.Testing.Platform/Hosts/TestHostControllersTestHost.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Hosts/TestHostControllersTestHost.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Configurations;
using Microsoft.Testing.Platform.Extensions;
diff --git a/src/Platform/Microsoft.Testing.Platform/Hosts/ToolsTestHost.cs b/src/Platform/Microsoft.Testing.Platform/Hosts/ToolsTestHost.cs
index b0ed844cc8..983cd2db40 100644
--- a/src/Platform/Microsoft.Testing.Platform/Hosts/ToolsTestHost.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Hosts/ToolsTestHost.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions;
using Microsoft.Testing.Platform.Extensions.CommandLine;
diff --git a/src/Platform/Microsoft.Testing.Platform/IPC/NamedPipeBase.cs b/src/Platform/Microsoft.Testing.Platform/IPC/NamedPipeBase.cs
index 9f75028cd4..4a12606676 100644
--- a/src/Platform/Microsoft.Testing.Platform/IPC/NamedPipeBase.cs
+++ b/src/Platform/Microsoft.Testing.Platform/IPC/NamedPipeBase.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
#if !PLATFORM_MSBUILD
using Microsoft.Testing.Platform.Resources;
#endif
diff --git a/src/Platform/Microsoft.Testing.Platform/IPC/NamedPipeServer.cs b/src/Platform/Microsoft.Testing.Platform/IPC/NamedPipeServer.cs
index 4a88dea246..d26b22bb40 100644
--- a/src/Platform/Microsoft.Testing.Platform/IPC/NamedPipeServer.cs
+++ b/src/Platform/Microsoft.Testing.Platform/IPC/NamedPipeServer.cs
@@ -4,7 +4,6 @@
#if NET
using System.Buffers;
#endif
-using System.Globalization;
using System.IO.Pipes;
using System.Runtime.InteropServices;
diff --git a/src/Platform/Microsoft.Testing.Platform/Logging/FileLogger.cs b/src/Platform/Microsoft.Testing.Platform/Logging/FileLogger.cs
index f48b06ef98..66b73c1be9 100644
--- a/src/Platform/Microsoft.Testing.Platform/Logging/FileLogger.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Logging/FileLogger.cs
@@ -6,9 +6,6 @@
#else
using System.Collections.Concurrent;
#endif
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
using Microsoft.Testing.Platform.Helpers;
using Microsoft.Testing.Platform.Resources;
diff --git a/src/Platform/Microsoft.Testing.Platform/Logging/TypeNameHelper.cs b/src/Platform/Microsoft.Testing.Platform/Logging/TypeNameHelper.cs
index d61f3c57ea..529043fd08 100644
--- a/src/Platform/Microsoft.Testing.Platform/Logging/TypeNameHelper.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Logging/TypeNameHelper.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Text;
-
namespace Microsoft.Testing.Platform.Logging;
///
diff --git a/src/Platform/Microsoft.Testing.Platform/Messages/AsynchronousMessageBus.cs b/src/Platform/Microsoft.Testing.Platform/Messages/AsynchronousMessageBus.cs
index f9e4b0cdf6..a1c0e02066 100644
--- a/src/Platform/Microsoft.Testing.Platform/Messages/AsynchronousMessageBus.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Messages/AsynchronousMessageBus.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
-using System.Text;
-
using Microsoft.Testing.Platform.Extensions.Messages;
using Microsoft.Testing.Platform.Extensions.TestHost;
using Microsoft.Testing.Platform.Helpers;
diff --git a/src/Platform/Microsoft.Testing.Platform/Messages/ChannelConsumerDataProcessor.cs b/src/Platform/Microsoft.Testing.Platform/Messages/ChannelConsumerDataProcessor.cs
index 4948060748..2982aeed35 100644
--- a/src/Platform/Microsoft.Testing.Platform/Messages/ChannelConsumerDataProcessor.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Messages/ChannelConsumerDataProcessor.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if NETCOREAPP
-using System.Diagnostics;
using System.Threading.Channels;
using Microsoft.Testing.Platform.Extensions.Messages;
diff --git a/src/Platform/Microsoft.Testing.Platform/Messages/MessageBusProxy.cs b/src/Platform/Microsoft.Testing.Platform/Messages/MessageBusProxy.cs
index 889dcd77c7..20f550e813 100644
--- a/src/Platform/Microsoft.Testing.Platform/Messages/MessageBusProxy.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Messages/MessageBusProxy.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.Testing.Platform.Extensions.Messages;
using Microsoft.Testing.Platform.Extensions.TestHost;
diff --git a/src/Platform/Microsoft.Testing.Platform/Messages/PropertyBag.Property.cs b/src/Platform/Microsoft.Testing.Platform/Messages/PropertyBag.Property.cs
index 7904841d55..132a0e5d01 100644
--- a/src/Platform/Microsoft.Testing.Platform/Messages/PropertyBag.Property.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Messages/PropertyBag.Property.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections;
-using System.Diagnostics;
namespace Microsoft.Testing.Platform.Extensions.Messages;
diff --git a/src/Platform/Microsoft.Testing.Platform/Messages/PropertyBag.cs b/src/Platform/Microsoft.Testing.Platform/Messages/PropertyBag.cs
index ba48bb2277..2a0475dbc9 100644
--- a/src/Platform/Microsoft.Testing.Platform/Messages/PropertyBag.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Messages/PropertyBag.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Extensions.Messages;
public sealed partial class PropertyBag
diff --git a/src/Platform/Microsoft.Testing.Platform/Messages/TestNodeProperties.cs b/src/Platform/Microsoft.Testing.Platform/Messages/TestNodeProperties.cs
index 01eb459e07..83afea914a 100644
--- a/src/Platform/Microsoft.Testing.Platform/Messages/TestNodeProperties.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Messages/TestNodeProperties.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Extensions.Messages;
///
diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/TargetFrameworkParser.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/TargetFrameworkParser.cs
index 1e8e4ec7a5..4d7b84441c 100644
--- a/src/Platform/Microsoft.Testing.Platform/OutputDevice/TargetFrameworkParser.cs
+++ b/src/Platform/Microsoft.Testing.Platform/OutputDevice/TargetFrameworkParser.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
namespace Microsoft.Testing.Platform.OutputDevice;
internal static class TargetFrameworkParser
diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/AnsiDetector.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/AnsiDetector.cs
index 3d949172d8..5dd4b3e884 100644
--- a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/AnsiDetector.cs
+++ b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/AnsiDetector.cs
@@ -5,8 +5,6 @@
// https://github.com/spectreconsole/spectre.console/blob/main/src/Spectre.Console/Internal/Backends/Ansi/AnsiDetector.cs
// and from the supports-ansi project by Qingrong Ke
// https://github.com/keqingrong/supports-ansi/blob/master/index.js
-using System.Text.RegularExpressions;
-
namespace Microsoft.Testing.Platform.OutputDevice.Terminal;
///
diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/AnsiTerminal.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/AnsiTerminal.cs
index 21a664fbb4..852b06646f 100644
--- a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/AnsiTerminal.cs
+++ b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/AnsiTerminal.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 System.Globalization;
using System.Runtime.InteropServices;
-using System.Text;
using Microsoft.Testing.Platform.Helpers;
using Microsoft.Testing.Platform.Resources;
diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/AnsiTerminalTestProgressFrame.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/AnsiTerminalTestProgressFrame.cs
index 35cd1f7e38..1d1bb64152 100644
--- a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/AnsiTerminalTestProgressFrame.cs
+++ b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/AnsiTerminalTestProgressFrame.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
namespace Microsoft.Testing.Platform.OutputDevice.Terminal;
///
diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/FileUtilities.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/FileUtilities.cs
index 4171136311..4cee07e414 100644
--- a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/FileUtilities.cs
+++ b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/FileUtilities.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
namespace Microsoft.Testing.Platform.OutputDevice.Terminal;
internal static class FileUtilities
diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/HumanReadableDurationFormatter.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/HumanReadableDurationFormatter.cs
index 27aa9af5d1..b28f5f0aa0 100644
--- a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/HumanReadableDurationFormatter.cs
+++ b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/HumanReadableDurationFormatter.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Text;
-
namespace Microsoft.Testing.Platform.OutputDevice.Terminal;
internal static class HumanReadableDurationFormatter
diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/NonAnsiTerminal.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/NonAnsiTerminal.cs
index 3f91a8a4be..44b8042803 100644
--- a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/NonAnsiTerminal.cs
+++ b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/NonAnsiTerminal.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Text;
-
using Microsoft.Testing.Platform.Helpers;
using Microsoft.Testing.Platform.Resources;
diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TerminalTestReporter.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TerminalTestReporter.cs
index 44b067a99c..2ee3a0a3e7 100644
--- a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TerminalTestReporter.cs
+++ b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TerminalTestReporter.cs
@@ -1,14 +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.
-#if !NET7_0_OR_GREATER
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-#endif
-
using System.Collections.Concurrent;
-using System.Globalization;
-using System.Text.RegularExpressions;
using Microsoft.Testing.Platform.Helpers;
using Microsoft.Testing.Platform.Resources;
diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TestNodeResultsState.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TestNodeResultsState.cs
index d0dc3f4056..016130c552 100644
--- a/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TestNodeResultsState.cs
+++ b/src/Platform/Microsoft.Testing.Platform/OutputDevice/Terminal/TestNodeResultsState.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Concurrent;
-using System.Globalization;
using Microsoft.Testing.Platform.Helpers;
using Microsoft.Testing.Platform.Resources;
diff --git a/src/Platform/Microsoft.Testing.Platform/OutputDevice/TerminalOutputDevice.cs b/src/Platform/Microsoft.Testing.Platform/OutputDevice/TerminalOutputDevice.cs
index f049246cab..a13176b2e4 100644
--- a/src/Platform/Microsoft.Testing.Platform/OutputDevice/TerminalOutputDevice.cs
+++ b/src/Platform/Microsoft.Testing.Platform/OutputDevice/TerminalOutputDevice.cs
@@ -1,11 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
using System.Runtime.InteropServices;
using System.Runtime.Versioning;
-using System.Text;
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions;
diff --git a/src/Platform/Microsoft.Testing.Platform/Requests/IExecuteRequestCompletionNotifier.cs b/src/Platform/Microsoft.Testing.Platform/Requests/IExecuteRequestCompletionNotifier.cs
index a60ec25302..09a2df1541 100644
--- a/src/Platform/Microsoft.Testing.Platform/Requests/IExecuteRequestCompletionNotifier.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Requests/IExecuteRequestCompletionNotifier.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Requests;
[Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
diff --git a/src/Platform/Microsoft.Testing.Platform/Requests/NopFilter.cs b/src/Platform/Microsoft.Testing.Platform/Requests/NopFilter.cs
index c8204a2493..3fbc1c9e55 100644
--- a/src/Platform/Microsoft.Testing.Platform/Requests/NopFilter.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Requests/NopFilter.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Requests;
[Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
diff --git a/src/Platform/Microsoft.Testing.Platform/Requests/TestHostTestFrameworkInvoker.cs b/src/Platform/Microsoft.Testing.Platform/Requests/TestHostTestFrameworkInvoker.cs
index edade0379b..f44eb1e82b 100644
--- a/src/Platform/Microsoft.Testing.Platform/Requests/TestHostTestFrameworkInvoker.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Requests/TestHostTestFrameworkInvoker.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.Testing.Platform.Capabilities;
using Microsoft.Testing.Platform.Capabilities.TestFramework;
using Microsoft.Testing.Platform.Extensions.Messages;
diff --git a/src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/TreeNodeFilter.cs b/src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/TreeNodeFilter.cs
index c7ed1b6bfc..5421aee941 100644
--- a/src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/TreeNodeFilter.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/TreeNodeFilter.cs
@@ -1,11 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-using System.Text.RegularExpressions;
-
using Microsoft.Testing.Platform.Extensions.Messages;
using Microsoft.Testing.Platform.Helpers;
using Microsoft.Testing.Platform.Resources;
diff --git a/src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/ValueAndPropertyExpression.cs b/src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/ValueAndPropertyExpression.cs
index f2930a0434..0c2403c349 100644
--- a/src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/ValueAndPropertyExpression.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/ValueAndPropertyExpression.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
namespace Microsoft.Testing.Platform.Requests;
///
diff --git a/src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/ValueExpression.cs b/src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/ValueExpression.cs
index bc2c713522..9cc04aec54 100644
--- a/src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/ValueExpression.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Requests/TreeNodeFilter/ValueExpression.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Text.RegularExpressions;
-
namespace Microsoft.Testing.Platform.Requests;
// An expression representing a single value.
diff --git a/src/Platform/Microsoft.Testing.Platform/ServerMode/DotnetTest/DotnetTestConnection.cs b/src/Platform/Microsoft.Testing.Platform/ServerMode/DotnetTest/DotnetTestConnection.cs
index db8f4d248c..fa7536af9e 100644
--- a/src/Platform/Microsoft.Testing.Platform/ServerMode/DotnetTest/DotnetTestConnection.cs
+++ b/src/Platform/Microsoft.Testing.Platform/ServerMode/DotnetTest/DotnetTestConnection.cs
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
using System.Runtime.InteropServices;
using Microsoft.Testing.Platform.CommandLine;
diff --git a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/ErrorCodes.cs b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/ErrorCodes.cs
index fba10b37fe..d001fa1d8c 100644
--- a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/ErrorCodes.cs
+++ b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/ErrorCodes.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.ServerMode;
[SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401:Fields should be private", Justification = "Common pattern to use public static readonly fields")]
diff --git a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/MessageHandlerFactory.cs b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/MessageHandlerFactory.cs
index e5d33e11d0..8733a93026 100644
--- a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/MessageHandlerFactory.cs
+++ b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/MessageHandlerFactory.cs
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
using System.Net;
using System.Net.Sockets;
diff --git a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/PassiveNode.cs b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/PassiveNode.cs
index 5cffc0761a..70a8642f30 100644
--- a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/PassiveNode.cs
+++ b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/PassiveNode.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.Testing.Platform.Helpers;
using Microsoft.Testing.Platform.Hosts;
using Microsoft.Testing.Platform.Logging;
diff --git a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/ServerModeManager.cs b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/ServerModeManager.cs
index 763311a238..c0bc80727b 100644
--- a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/ServerModeManager.cs
+++ b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/ServerModeManager.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Resources;
using Microsoft.Testing.Platform.Services;
diff --git a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/ServerModePerCallOutputDevice.cs b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/ServerModePerCallOutputDevice.cs
index 8c831b8f7f..bf592075d5 100644
--- a/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/ServerModePerCallOutputDevice.cs
+++ b/src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/ServerModePerCallOutputDevice.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Concurrent;
-using System.Globalization;
-using System.Text;
using Microsoft.Testing.Platform.Extensions.OutputDevice;
using Microsoft.Testing.Platform.Helpers;
diff --git a/src/Platform/Microsoft.Testing.Platform/Services/CurrentTestApplicationModuleInfo.cs b/src/Platform/Microsoft.Testing.Platform/Services/CurrentTestApplicationModuleInfo.cs
index 15c7d4a418..80bac6feaa 100644
--- a/src/Platform/Microsoft.Testing.Platform/Services/CurrentTestApplicationModuleInfo.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Services/CurrentTestApplicationModuleInfo.cs
@@ -1,11 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-#if NETCOREAPP
-using System.Diagnostics.CodeAnalysis;
-#endif
-
-using System.Reflection;
using System.Runtime.InteropServices;
using Microsoft.Testing.Platform.Helpers;
diff --git a/src/Platform/Microsoft.Testing.Platform/Services/IClientInfo.cs b/src/Platform/Microsoft.Testing.Platform/Services/IClientInfo.cs
index b6a5d573b8..cb984ad86a 100644
--- a/src/Platform/Microsoft.Testing.Platform/Services/IClientInfo.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Services/IClientInfo.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Services;
[Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
diff --git a/src/Platform/Microsoft.Testing.Platform/Services/IPlatformInformation.cs b/src/Platform/Microsoft.Testing.Platform/Services/IPlatformInformation.cs
index 2a90bf3569..92ba052ba9 100644
--- a/src/Platform/Microsoft.Testing.Platform/Services/IPlatformInformation.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Services/IPlatformInformation.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-
namespace Microsoft.Testing.Platform.Services;
[Experimental("TPEXP", UrlFormat = "https://aka.ms/testingplatform/diagnostics#{0}")]
diff --git a/src/Platform/Microsoft.Testing.Platform/Services/ServiceProvider.cs b/src/Platform/Microsoft.Testing.Platform/Services/ServiceProvider.cs
index c39ef4aedd..22baff7e4e 100644
--- a/src/Platform/Microsoft.Testing.Platform/Services/ServiceProvider.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Services/ServiceProvider.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.Extensions.TestFramework;
using Microsoft.Testing.Platform.Extensions.TestHost;
using Microsoft.Testing.Platform.Extensions.TestHostControllers;
diff --git a/src/Platform/Microsoft.Testing.Platform/Services/ServiceProviderExtensions.cs b/src/Platform/Microsoft.Testing.Platform/Services/ServiceProviderExtensions.cs
index bb694a845b..f817c49e38 100644
--- a/src/Platform/Microsoft.Testing.Platform/Services/ServiceProviderExtensions.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Services/ServiceProviderExtensions.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
using Microsoft.Testing.Platform.Capabilities.TestFramework;
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Configurations;
diff --git a/src/Platform/Microsoft.Testing.Platform/Services/TestApplicationResult.cs b/src/Platform/Microsoft.Testing.Platform/Services/TestApplicationResult.cs
index 0b19b09d89..a8b5149079 100644
--- a/src/Platform/Microsoft.Testing.Platform/Services/TestApplicationResult.cs
+++ b/src/Platform/Microsoft.Testing.Platform/Services/TestApplicationResult.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions.Messages;
using Microsoft.Testing.Platform.Extensions.OutputDevice;
diff --git a/src/Platform/Microsoft.Testing.Platform/TestFramework/ExecuteRequestContext.cs b/src/Platform/Microsoft.Testing.Platform/TestFramework/ExecuteRequestContext.cs
index d990139d3c..2a38535230 100644
--- a/src/Platform/Microsoft.Testing.Platform/TestFramework/ExecuteRequestContext.cs
+++ b/src/Platform/Microsoft.Testing.Platform/TestFramework/ExecuteRequestContext.cs
@@ -3,8 +3,6 @@
#pragma warning disable RS0016 // Add public types and members to the declared API
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.Testing.Platform.Messages;
using Microsoft.Testing.Platform.Requests;
diff --git a/src/Platform/Microsoft.Testing.Platform/TestHost/TestHostManager.cs b/src/Platform/Microsoft.Testing.Platform/TestHost/TestHostManager.cs
index c591311896..684e3cfeec 100644
--- a/src/Platform/Microsoft.Testing.Platform/TestHost/TestHostManager.cs
+++ b/src/Platform/Microsoft.Testing.Platform/TestHost/TestHostManager.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.Extensions;
using Microsoft.Testing.Platform.Extensions.TestHost;
using Microsoft.Testing.Platform.Helpers;
diff --git a/src/Platform/Microsoft.Testing.Platform/TestHostControllers/EnvironmentVariables.cs b/src/Platform/Microsoft.Testing.Platform/TestHostControllers/EnvironmentVariables.cs
index ca8aa730b4..4ca6397932 100644
--- a/src/Platform/Microsoft.Testing.Platform/TestHostControllers/EnvironmentVariables.cs
+++ b/src/Platform/Microsoft.Testing.Platform/TestHostControllers/EnvironmentVariables.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
using Microsoft.Testing.Platform.Extensions.TestHostControllers;
using Microsoft.Testing.Platform.Logging;
using Microsoft.Testing.Platform.Resources;
diff --git a/src/Platform/Microsoft.Testing.Platform/TestHostControllers/IReadOnlyEnvironmentVariables.cs b/src/Platform/Microsoft.Testing.Platform/TestHostControllers/IReadOnlyEnvironmentVariables.cs
index 12b9fadc1b..99f816a186 100644
--- a/src/Platform/Microsoft.Testing.Platform/TestHostControllers/IReadOnlyEnvironmentVariables.cs
+++ b/src/Platform/Microsoft.Testing.Platform/TestHostControllers/IReadOnlyEnvironmentVariables.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.Testing.Platform.Extensions.TestHostControllers;
///
diff --git a/src/Platform/Microsoft.Testing.Platform/TestHostControllers/TestHostControllerInfo.cs b/src/Platform/Microsoft.Testing.Platform/TestHostControllers/TestHostControllerInfo.cs
index d5acd12d96..74df6d11ca 100644
--- a/src/Platform/Microsoft.Testing.Platform/TestHostControllers/TestHostControllerInfo.cs
+++ b/src/Platform/Microsoft.Testing.Platform/TestHostControllers/TestHostControllerInfo.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.CommandLine;
namespace Microsoft.Testing.Platform.TestHostControllers;
diff --git a/src/Platform/Microsoft.Testing.Platform/TestHostControllers/TestHostControllersManager.cs b/src/Platform/Microsoft.Testing.Platform/TestHostControllers/TestHostControllersManager.cs
index 5635675e1b..63f76ad980 100644
--- a/src/Platform/Microsoft.Testing.Platform/TestHostControllers/TestHostControllersManager.cs
+++ b/src/Platform/Microsoft.Testing.Platform/TestHostControllers/TestHostControllersManager.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.Configurations;
using Microsoft.Testing.Platform.Extensions;
using Microsoft.Testing.Platform.Extensions.TestHost;
diff --git a/src/Platform/Microsoft.Testing.Platform/TestHostOrcherstrator/TestHostOrchestratorManager.cs b/src/Platform/Microsoft.Testing.Platform/TestHostOrcherstrator/TestHostOrchestratorManager.cs
index 675e94dc09..d6f7a628bf 100644
--- a/src/Platform/Microsoft.Testing.Platform/TestHostOrcherstrator/TestHostOrchestratorManager.cs
+++ b/src/Platform/Microsoft.Testing.Platform/TestHostOrcherstrator/TestHostOrchestratorManager.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.Resources;
using Microsoft.Testing.Platform.Services;
diff --git a/src/TestFramework/TestFramework.Extensions/AppModel.cs b/src/TestFramework/TestFramework.Extensions/AppModel.cs
index 2b8f49683b..07610769d7 100644
--- a/src/TestFramework/TestFramework.Extensions/AppModel.cs
+++ b/src/TestFramework/TestFramework.Extensions/AppModel.cs
@@ -2,9 +2,7 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if WIN_UI
-using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
-using System.Text;
namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.AppContainer;
diff --git a/src/TestFramework/TestFramework.Extensions/Attributes/WinUITestTargetAttribute.cs b/src/TestFramework/TestFramework.Extensions/Attributes/WinUITestTargetAttribute.cs
index a450e0b878..e440b2f31d 100644
--- a/src/TestFramework/TestFramework.Extensions/Attributes/WinUITestTargetAttribute.cs
+++ b/src/TestFramework/TestFramework.Extensions/Attributes/WinUITestTargetAttribute.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if WIN_UI
-using System.Globalization;
namespace Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
diff --git a/src/TestFramework/TestFramework.Extensions/Attributes/WinUI_UITestMethodAttribute.cs b/src/TestFramework/TestFramework.Extensions/Attributes/WinUI_UITestMethodAttribute.cs
index ec26f36df5..1dd198127e 100644
--- a/src/TestFramework/TestFramework.Extensions/Attributes/WinUI_UITestMethodAttribute.cs
+++ b/src/TestFramework/TestFramework.Extensions/Attributes/WinUI_UITestMethodAttribute.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if WIN_UI
-using System.Reflection;
using System.Runtime.CompilerServices;
using Microsoft.UI.Dispatching;
diff --git a/src/TestFramework/TestFramework.Extensions/ConfigurationSettings/DataSourceElementCollection.cs b/src/TestFramework/TestFramework.Extensions/ConfigurationSettings/DataSourceElementCollection.cs
index b2bd44da6f..fa3293b942 100644
--- a/src/TestFramework/TestFramework.Extensions/ConfigurationSettings/DataSourceElementCollection.cs
+++ b/src/TestFramework/TestFramework.Extensions/ConfigurationSettings/DataSourceElementCollection.cs
@@ -4,7 +4,6 @@
#if NETFRAMEWORK
using System.Configuration;
-using System.Diagnostics.CodeAnalysis;
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/TestFramework/TestFramework.Extensions/PrivateObject.cs b/src/TestFramework/TestFramework.Extensions/PrivateObject.cs
index ba97ebbbdd..0fc6b2fb91 100644
--- a/src/TestFramework/TestFramework.Extensions/PrivateObject.cs
+++ b/src/TestFramework/TestFramework.Extensions/PrivateObject.cs
@@ -2,9 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if NETFRAMEWORK
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/TestFramework/TestFramework.Extensions/PrivateType.cs b/src/TestFramework/TestFramework.Extensions/PrivateType.cs
index 9d188e76d8..0b696c7ca3 100644
--- a/src/TestFramework/TestFramework.Extensions/PrivateType.cs
+++ b/src/TestFramework/TestFramework.Extensions/PrivateType.cs
@@ -3,9 +3,6 @@
#if NETFRAMEWORK
-using System.Globalization;
-using System.Reflection;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework.Extensions/RuntimeTypeHelper.cs b/src/TestFramework/TestFramework.Extensions/RuntimeTypeHelper.cs
index 984319f536..ceca146b91 100644
--- a/src/TestFramework/TestFramework.Extensions/RuntimeTypeHelper.cs
+++ b/src/TestFramework/TestFramework.Extensions/RuntimeTypeHelper.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if NETFRAMEWORK
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/TestFramework/TestFramework.Extensions/TestContext.cs b/src/TestFramework/TestFramework.Extensions/TestContext.cs
index 1d559cccd2..e6e0a1bf0a 100644
--- a/src/TestFramework/TestFramework.Extensions/TestContext.cs
+++ b/src/TestFramework/TestFramework.Extensions/TestContext.cs
@@ -6,8 +6,6 @@
using System.Data;
using System.Data.Common;
#endif
-using System.Diagnostics;
-using System.Globalization;
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/TestFramework/TestFramework/Assertions/Assert.AreEqual.cs b/src/TestFramework/TestFramework/Assertions/Assert.AreEqual.cs
index d186f6721b..defca4bcc5 100644
--- a/src/TestFramework/TestFramework/Assertions/Assert.AreEqual.cs
+++ b/src/TestFramework/TestFramework/Assertions/Assert.AreEqual.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Assertions/Assert.AreSame.cs b/src/TestFramework/TestFramework/Assertions/Assert.AreSame.cs
index 07115c97d1..b2fd9113d1 100644
--- a/src/TestFramework/TestFramework/Assertions/Assert.AreSame.cs
+++ b/src/TestFramework/TestFramework/Assertions/Assert.AreSame.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Assertions/Assert.Fail.cs b/src/TestFramework/TestFramework/Assertions/Assert.Fail.cs
index 280c261902..e86761c182 100644
--- a/src/TestFramework/TestFramework/Assertions/Assert.Fail.cs
+++ b/src/TestFramework/TestFramework/Assertions/Assert.Fail.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Assertions/Assert.Inconclusive.cs b/src/TestFramework/TestFramework/Assertions/Assert.Inconclusive.cs
index 7a53795dee..1124379a0c 100644
--- a/src/TestFramework/TestFramework/Assertions/Assert.Inconclusive.cs
+++ b/src/TestFramework/TestFramework/Assertions/Assert.Inconclusive.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Assertions/Assert.IsInstanceOfType.cs b/src/TestFramework/TestFramework/Assertions/Assert.IsInstanceOfType.cs
index 81392a5742..84adbb12b5 100644
--- a/src/TestFramework/TestFramework/Assertions/Assert.IsInstanceOfType.cs
+++ b/src/TestFramework/TestFramework/Assertions/Assert.IsInstanceOfType.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Assertions/Assert.IsNull.cs b/src/TestFramework/TestFramework/Assertions/Assert.IsNull.cs
index 5c6300c80e..96df80dd1d 100644
--- a/src/TestFramework/TestFramework/Assertions/Assert.IsNull.cs
+++ b/src/TestFramework/TestFramework/Assertions/Assert.IsNull.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Assertions/Assert.IsTrue.cs b/src/TestFramework/TestFramework/Assertions/Assert.IsTrue.cs
index a28b3aa331..62e96b5470 100644
--- a/src/TestFramework/TestFramework/Assertions/Assert.IsTrue.cs
+++ b/src/TestFramework/TestFramework/Assertions/Assert.IsTrue.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Assertions/Assert.ThrowsException.cs b/src/TestFramework/TestFramework/Assertions/Assert.ThrowsException.cs
index 39658439f9..db43b4fa25 100644
--- a/src/TestFramework/TestFramework/Assertions/Assert.ThrowsException.cs
+++ b/src/TestFramework/TestFramework/Assertions/Assert.ThrowsException.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.ComponentModel;
-using System.Globalization;
using System.Runtime.CompilerServices;
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/TestFramework/TestFramework/Assertions/Assert.cs b/src/TestFramework/TestFramework/Assertions/Assert.cs
index a6ec288cf0..f630895073 100644
--- a/src/TestFramework/TestFramework/Assertions/Assert.cs
+++ b/src/TestFramework/TestFramework/Assertions/Assert.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Assertions/CollectionAssert.cs b/src/TestFramework/TestFramework/Assertions/CollectionAssert.cs
index bf76e223d5..25a4f25f13 100644
--- a/src/TestFramework/TestFramework/Assertions/CollectionAssert.cs
+++ b/src/TestFramework/TestFramework/Assertions/CollectionAssert.cs
@@ -2,9 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/TestFramework/TestFramework/Assertions/StringAssert.cs b/src/TestFramework/TestFramework/Assertions/StringAssert.cs
index 3f0de64de9..b4f88415d3 100644
--- a/src/TestFramework/TestFramework/Assertions/StringAssert.cs
+++ b/src/TestFramework/TestFramework/Assertions/StringAssert.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text.RegularExpressions;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Attributes/DataSource/DataRowAttribute.cs b/src/TestFramework/TestFramework/Attributes/DataSource/DataRowAttribute.cs
index 270452d4db..4fdb946813 100644
--- a/src/TestFramework/TestFramework/Attributes/DataSource/DataRowAttribute.cs
+++ b/src/TestFramework/TestFramework/Attributes/DataSource/DataRowAttribute.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Reflection;
-
using Microsoft.VisualStudio.TestTools.UnitTesting.Internal;
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/TestFramework/TestFramework/Attributes/DataSource/DataSourceAttribute.cs b/src/TestFramework/TestFramework/Attributes/DataSource/DataSourceAttribute.cs
index ac30e26910..bd1f890128 100644
--- a/src/TestFramework/TestFramework/Attributes/DataSource/DataSourceAttribute.cs
+++ b/src/TestFramework/TestFramework/Attributes/DataSource/DataSourceAttribute.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Attributes/DataSource/DynamicDataAttribute.cs b/src/TestFramework/TestFramework/Attributes/DataSource/DynamicDataAttribute.cs
index 3361ea15d0..48825c992c 100644
--- a/src/TestFramework/TestFramework/Attributes/DataSource/DynamicDataAttribute.cs
+++ b/src/TestFramework/TestFramework/Attributes/DataSource/DynamicDataAttribute.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.ComponentModel;
-using System.Globalization;
-using System.Reflection;
using Microsoft.VisualStudio.TestTools.UnitTesting.Internal;
diff --git a/src/TestFramework/TestFramework/Attributes/DataSource/DynamicDataProvider.cs b/src/TestFramework/TestFramework/Attributes/DataSource/DynamicDataProvider.cs
index 9cc9745589..6b04212aa6 100644
--- a/src/TestFramework/TestFramework/Attributes/DataSource/DynamicDataProvider.cs
+++ b/src/TestFramework/TestFramework/Attributes/DataSource/DynamicDataProvider.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
internal static class DynamicDataProvider
diff --git a/src/TestFramework/TestFramework/Attributes/DataSource/IDynamicDataOperations.cs b/src/TestFramework/TestFramework/Attributes/DataSource/IDynamicDataOperations.cs
index b54bef8ccc..e865440d94 100644
--- a/src/TestFramework/TestFramework/Attributes/DataSource/IDynamicDataOperations.cs
+++ b/src/TestFramework/TestFramework/Attributes/DataSource/IDynamicDataOperations.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Reflection;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
internal interface IDynamicDataOperations
diff --git a/src/TestFramework/TestFramework/Attributes/TestMethod/ExpectedExceptionAttribute.cs b/src/TestFramework/TestFramework/Attributes/TestMethod/ExpectedExceptionAttribute.cs
index 5cd6c160b8..7ed4c41298 100644
--- a/src/TestFramework/TestFramework/Attributes/TestMethod/ExpectedExceptionAttribute.cs
+++ b/src/TestFramework/TestFramework/Attributes/TestMethod/ExpectedExceptionAttribute.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Attributes/TestMethod/ExpectedExceptionBaseAttribute.cs b/src/TestFramework/TestFramework/Attributes/TestMethod/ExpectedExceptionBaseAttribute.cs
index e15d9f4889..1ce1a23c30 100644
--- a/src/TestFramework/TestFramework/Attributes/TestMethod/ExpectedExceptionBaseAttribute.cs
+++ b/src/TestFramework/TestFramework/Attributes/TestMethod/ExpectedExceptionBaseAttribute.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Attributes/TestMethod/TestCategoryAttribute.cs b/src/TestFramework/TestFramework/Attributes/TestMethod/TestCategoryAttribute.cs
index c592252ee1..fd4633692e 100644
--- a/src/TestFramework/TestFramework/Attributes/TestMethod/TestCategoryAttribute.cs
+++ b/src/TestFramework/TestFramework/Attributes/TestMethod/TestCategoryAttribute.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Attributes/TestMethod/TestTimeout.cs b/src/TestFramework/TestFramework/Attributes/TestMethod/TestTimeout.cs
index 6258616497..3c5aab0c09 100644
--- a/src/TestFramework/TestFramework/Attributes/TestMethod/TestTimeout.cs
+++ b/src/TestFramework/TestFramework/Attributes/TestMethod/TestTimeout.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/GenericParameterHelper.cs b/src/TestFramework/TestFramework/GenericParameterHelper.cs
index 94e0308c15..f721bf7f27 100644
--- a/src/TestFramework/TestFramework/GenericParameterHelper.cs
+++ b/src/TestFramework/TestFramework/GenericParameterHelper.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections;
-using System.Diagnostics.CodeAnalysis;
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/TestFramework/TestFramework/Interfaces/EmptyDataSourceExceptionInfoExtensions.cs b/src/TestFramework/TestFramework/Interfaces/EmptyDataSourceExceptionInfoExtensions.cs
index 6033eaa74f..b281bb829c 100644
--- a/src/TestFramework/TestFramework/Interfaces/EmptyDataSourceExceptionInfoExtensions.cs
+++ b/src/TestFramework/TestFramework/Interfaces/EmptyDataSourceExceptionInfoExtensions.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
internal static class EmptyDataSourceExceptionInfoExtensions
diff --git a/src/TestFramework/TestFramework/Interfaces/ITestDataSource.cs b/src/TestFramework/TestFramework/Interfaces/ITestDataSource.cs
index 55fe97f6e6..ea1d9dbc26 100644
--- a/src/TestFramework/TestFramework/Interfaces/ITestDataSource.cs
+++ b/src/TestFramework/TestFramework/Interfaces/ITestDataSource.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Reflection;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Interfaces/ITestDataSourceEmptyDataSourceExceptionInfo.cs b/src/TestFramework/TestFramework/Interfaces/ITestDataSourceEmptyDataSourceExceptionInfo.cs
index e704a2f5ee..17aaece396 100644
--- a/src/TestFramework/TestFramework/Interfaces/ITestDataSourceEmptyDataSourceExceptionInfo.cs
+++ b/src/TestFramework/TestFramework/Interfaces/ITestDataSourceEmptyDataSourceExceptionInfo.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Reflection;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
internal interface ITestDataSourceEmptyDataSourceExceptionInfo
diff --git a/src/TestFramework/TestFramework/Interfaces/ITestMethod.cs b/src/TestFramework/TestFramework/Interfaces/ITestMethod.cs
index 7075480d95..3f406901e8 100644
--- a/src/TestFramework/TestFramework/Interfaces/ITestMethod.cs
+++ b/src/TestFramework/TestFramework/Interfaces/ITestMethod.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Reflection;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Internal/DebugEx.cs b/src/TestFramework/TestFramework/Internal/DebugEx.cs
index 2f988ea9b1..8ce56c4b86 100644
--- a/src/TestFramework/TestFramework/Internal/DebugEx.cs
+++ b/src/TestFramework/TestFramework/Internal/DebugEx.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
[SuppressMessage("ApiDesign", "RS0030:Do not used banned APIs", Justification = "Replacement API to allow nullable hints for compiler")]
diff --git a/src/TestFramework/TestFramework/Internal/ReflectionTestMethodInfo.cs b/src/TestFramework/TestFramework/Internal/ReflectionTestMethodInfo.cs
index a3ce7ea801..6eee7ba64e 100644
--- a/src/TestFramework/TestFramework/Internal/ReflectionTestMethodInfo.cs
+++ b/src/TestFramework/TestFramework/Internal/ReflectionTestMethodInfo.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting.Internal;
internal sealed class ReflectionTestMethodInfo : MethodInfo
diff --git a/src/TestFramework/TestFramework/Internal/StringEx.cs b/src/TestFramework/TestFramework/Internal/StringEx.cs
index ac7c314feb..27a38704bc 100644
--- a/src/TestFramework/TestFramework/Internal/StringEx.cs
+++ b/src/TestFramework/TestFramework/Internal/StringEx.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
internal static class StringEx
diff --git a/src/TestFramework/TestFramework/Internal/TestDataSourceUtilities.cs b/src/TestFramework/TestFramework/Internal/TestDataSourceUtilities.cs
index 4a5efebcb5..ab8497809d 100644
--- a/src/TestFramework/TestFramework/Internal/TestDataSourceUtilities.cs
+++ b/src/TestFramework/TestFramework/Internal/TestDataSourceUtilities.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections;
-using System.Globalization;
-using System.Reflection;
namespace Microsoft.VisualStudio.TestTools.UnitTesting.Internal;
diff --git a/src/TestFramework/TestFramework/Internal/UtfHelper.cs b/src/TestFramework/TestFramework/Internal/UtfHelper.cs
index 73ebb2c873..63356e0cb7 100644
--- a/src/TestFramework/TestFramework/Internal/UtfHelper.cs
+++ b/src/TestFramework/TestFramework/Internal/UtfHelper.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting;
///
diff --git a/src/TestFramework/TestFramework/Logger.cs b/src/TestFramework/TestFramework/Logger.cs
index c12dcae50f..46c4bbd224 100644
--- a/src/TestFramework/TestFramework/Logger.cs
+++ b/src/TestFramework/TestFramework/Logger.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-
namespace Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
///
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/GenericTestMethodTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/GenericTestMethodTests.cs
index ef0053229a..4eb3aaeb1b 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/GenericTestMethodTests.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/GenericTestMethodTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Text.RegularExpressions;
-
using Microsoft.Testing.Platform.Acceptance.IntegrationTests;
using Microsoft.Testing.Platform.Acceptance.IntegrationTests.Helpers;
using Microsoft.Testing.Platform.Helpers;
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/InitializeAndCleanupTimeoutTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/InitializeAndCleanupTimeoutTests.cs
index 2a78f7726f..6e6be067c8 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/InitializeAndCleanupTimeoutTests.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/InitializeAndCleanupTimeoutTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.Testing.Platform.Acceptance.IntegrationTests;
using Microsoft.Testing.Platform.Acceptance.IntegrationTests.Helpers;
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/MaxFailedTestsExtensionTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/MaxFailedTestsExtensionTests.cs
index fe3753fae4..6d11054c28 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/MaxFailedTestsExtensionTests.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/MaxFailedTestsExtensionTests.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Text.RegularExpressions;
-
using Microsoft.Testing.Platform.Acceptance.IntegrationTests;
using Microsoft.Testing.Platform.Acceptance.IntegrationTests.Helpers;
using Microsoft.Testing.Platform.Helpers;
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/Program.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/Program.cs
index 8234276d1a..116b5bef8d 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/Program.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/Program.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Reflection;
-
using Microsoft.Testing.Extensions;
[assembly: Parallelize(Scope = ExecutionScope.MethodLevel, Workers = 0)]
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/RunsettingsTests.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/RunsettingsTests.cs
index 09bcd2b58a..1f2cc307aa 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/RunsettingsTests.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/RunsettingsTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.Acceptance.IntegrationTests;
using Microsoft.Testing.Platform.Acceptance.IntegrationTests.Helpers;
using Microsoft.Testing.Platform.Helpers;
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/ServerModeTestsBase.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/ServerModeTestsBase.cs
index 00f2a47feb..4b06152b3f 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/ServerModeTestsBase.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/ServerModeTestsBase.cs
@@ -2,11 +2,8 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections;
-using System.Globalization;
using System.Net;
using System.Net.Sockets;
-using System.Text;
-using System.Text.RegularExpressions;
using Microsoft.Testing.Platform.Acceptance.IntegrationTests;
using Microsoft.Testing.Platform.ServerMode.IntegrationTests.Messages.V100;
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/ClientInfo.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/ClientInfo.cs
index a4548d891f..5acc6821ed 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/ClientInfo.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/ClientInfo.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Text.Json;
-
using Newtonsoft.Json;
namespace Microsoft.Testing.Platform.ServerMode.IntegrationTests.Messages.V100;
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/InitializeRequest.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/InitializeRequest.cs
index abf5adb281..f15e94ab37 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/InitializeRequest.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/InitializeRequest.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Text.Json;
-
using Newtonsoft.Json;
namespace Microsoft.Testing.Platform.ServerMode.IntegrationTests.Messages.V100;
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/RpcListener.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/RpcListener.cs
index 6bed732b68..e4eca6facb 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/RpcListener.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/RpcListener.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
namespace Microsoft.Testing.Platform.ServerMode.IntegrationTests.Messages.V100;
internal sealed class ConsoleRpcListener : TraceListener
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/ServerInfo.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/ServerInfo.cs
index ccab026462..e2b0e4a49f 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/ServerInfo.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/ServerInfo.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Text.Json;
-
using Newtonsoft.Json;
namespace Microsoft.Testing.Platform.ServerMode.IntegrationTests.Messages.V100;
diff --git a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/TestingPlatformClient.cs b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/TestingPlatformClient.cs
index 9e9c68f311..71351406aa 100644
--- a/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/TestingPlatformClient.cs
+++ b/test/IntegrationTests/MSTest.Acceptance.IntegrationTests/ServerMode/v1.0.0/TestingPlatformClient.cs
@@ -2,9 +2,7 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Concurrent;
-using System.Diagnostics;
using System.Net.Sockets;
-using System.Text;
using MSTest.Acceptance.IntegrationTests.Messages.V100;
diff --git a/test/IntegrationTests/MSTest.IntegrationTests/OutputTests.cs b/test/IntegrationTests/MSTest.IntegrationTests/OutputTests.cs
index fcb07b4ed8..2ab4ae7562 100644
--- a/test/IntegrationTests/MSTest.IntegrationTests/OutputTests.cs
+++ b/test/IntegrationTests/MSTest.IntegrationTests/OutputTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using FluentAssertions;
using Microsoft.MSTestV2.CLIAutomation;
diff --git a/test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.cs b/test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.cs
index 12e2592fd6..d9515ce8fd 100644
--- a/test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.cs
+++ b/test/IntegrationTests/MSTest.IntegrationTests/Utilities/CLITestBase.discovery.cs
@@ -3,7 +3,6 @@
using System.Collections.Concurrent;
using System.Collections.Immutable;
-using System.Diagnostics;
using DiscoveryAndExecutionTests.Utilities;
diff --git a/test/IntegrationTests/MSTest.IntegrationTests/Utilities/TestCaseFilterFactory.cs b/test/IntegrationTests/MSTest.IntegrationTests/Utilities/TestCaseFilterFactory.cs
index a662bb0f00..61976debed 100644
--- a/test/IntegrationTests/MSTest.IntegrationTests/Utilities/TestCaseFilterFactory.cs
+++ b/test/IntegrationTests/MSTest.IntegrationTests/Utilities/TestCaseFilterFactory.cs
@@ -2,9 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Linq.Expressions;
-using System.Reflection;
-using System.Text;
-using System.Text.RegularExpressions;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
diff --git a/test/IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests/DeploymentTests.cs b/test/IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests/DeploymentTests.cs
index 0125ea0206..4ef5aaf14c 100644
--- a/test/IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests/DeploymentTests.cs
+++ b/test/IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests/DeploymentTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.MSTestV2.CLIAutomation;
namespace MSTest.VstestConsoleWrapper.IntegrationTests;
diff --git a/test/IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests/Parameterized tests/DataSourceTests.cs b/test/IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests/Parameterized tests/DataSourceTests.cs
index 71ca40fa64..31a41e6d4a 100644
--- a/test/IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests/Parameterized tests/DataSourceTests.cs
+++ b/test/IntegrationTests/MSTest.VstestConsoleWrapper.IntegrationTests/Parameterized tests/DataSourceTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.MSTestV2.CLIAutomation;
namespace MSTest.VstestConsoleWrapper.IntegrationTests;
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/DiagnosticTests.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/DiagnosticTests.cs
index 2bf2316c5b..2dd83c8e23 100644
--- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/DiagnosticTests.cs
+++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/DiagnosticTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Text.RegularExpressions;
-
using Microsoft.Testing.Platform.Configurations;
namespace Microsoft.Testing.Platform.Acceptance.IntegrationTests;
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/ExecutionTests.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/ExecutionTests.cs
index 55fdea8a53..3ea7ab3952 100644
--- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/ExecutionTests.cs
+++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/ExecutionTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
namespace Microsoft.Testing.Platform.Acceptance.IntegrationTests;
[TestClass]
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/ExitOnProcessExitTests.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/ExitOnProcessExitTests.cs
index d7382cc3b0..b1cdf270aa 100644
--- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/ExitOnProcessExitTests.cs
+++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/ExitOnProcessExitTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
namespace Microsoft.Testing.Platform.Acceptance.IntegrationTests;
[TestClass]
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Helpers/AcceptanceAssert.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Helpers/AcceptanceAssert.cs
index 737af51263..051c8fdce9 100644
--- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Helpers/AcceptanceAssert.cs
+++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Helpers/AcceptanceAssert.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 System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;
-using System.Text.RegularExpressions;
namespace Microsoft.Testing.Platform.Acceptance.IntegrationTests.Helpers;
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Helpers/AcceptanceTestBase.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Helpers/AcceptanceTestBase.cs
index 5ccb4afda2..c7d444b3bc 100644
--- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Helpers/AcceptanceTestBase.cs
+++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Helpers/AcceptanceTestBase.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
using System.Runtime.InteropServices;
using System.Xml.Linq;
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.ConfigurationFile.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.ConfigurationFile.cs
index 12f1a09318..976b275f43 100644
--- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.ConfigurationFile.cs
+++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.ConfigurationFile.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Text.RegularExpressions;
-
namespace Microsoft.Testing.Platform.Acceptance.IntegrationTests;
[TestClass]
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.Test.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.Test.cs
index 796bcfffe2..716a18bb6b 100644
--- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.Test.cs
+++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/MSBuildTests.Test.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 System.Reflection;
using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
namespace Microsoft.Testing.Platform.Acceptance.IntegrationTests;
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Program.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Program.cs
index 4514fbbfd0..5463488c7f 100644
--- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Program.cs
+++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/Program.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Reflection;
-
using Microsoft.Testing.Extensions;
[assembly: Parallelize(Scope = ExecutionScope.MethodLevel, Workers = 0)]
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/ServerLoggingTests.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/ServerLoggingTests.cs
index 3215b5ad54..5327fd60e3 100644
--- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/ServerLoggingTests.cs
+++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/ServerLoggingTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Text.RegularExpressions;
-
using Microsoft.Testing.Platform.ServerMode.IntegrationTests.Messages.V100;
using MSTest.Acceptance.IntegrationTests.Messages.V100;
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TelemetryTests.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TelemetryTests.cs
index 4c8706a742..919edc355b 100644
--- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TelemetryTests.cs
+++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TelemetryTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Text.RegularExpressions;
-
using Microsoft.Testing.Platform.Configurations;
namespace Microsoft.Testing.Platform.Acceptance.IntegrationTests;
diff --git a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TrxTests.cs b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TrxTests.cs
index 979364b7e4..7f936492a8 100644
--- a/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TrxTests.cs
+++ b/test/IntegrationTests/Microsoft.Testing.Platform.Acceptance.IntegrationTests/TrxTests.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Runtime.InteropServices;
-using System.Text.RegularExpressions;
namespace Microsoft.Testing.Platform.Acceptance.IntegrationTests;
diff --git a/test/IntegrationTests/TestAssets/DataRowTestProject/DataRowTests_DerivedClass.cs b/test/IntegrationTests/TestAssets/DataRowTestProject/DataRowTests_DerivedClass.cs
index 08cbb82f2e..3bb8e29f39 100644
--- a/test/IntegrationTests/TestAssets/DataRowTestProject/DataRowTests_DerivedClass.cs
+++ b/test/IntegrationTests/TestAssets/DataRowTestProject/DataRowTests_DerivedClass.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace DataRowTestProject;
diff --git a/test/IntegrationTests/TestAssets/DataRowTestProject/DataRowTests_Enums.cs b/test/IntegrationTests/TestAssets/DataRowTestProject/DataRowTests_Enums.cs
index b3ce205f65..24cdff7f1e 100644
--- a/test/IntegrationTests/TestAssets/DataRowTestProject/DataRowTests_Enums.cs
+++ b/test/IntegrationTests/TestAssets/DataRowTestProject/DataRowTests_Enums.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace DataRowTestProject;
diff --git a/test/IntegrationTests/TestAssets/FxExtensibilityTestProject/TestDataSourceExTests.cs b/test/IntegrationTests/TestAssets/FxExtensibilityTestProject/TestDataSourceExTests.cs
index a040957911..17e0c80ab6 100644
--- a/test/IntegrationTests/TestAssets/FxExtensibilityTestProject/TestDataSourceExTests.cs
+++ b/test/IntegrationTests/TestAssets/FxExtensibilityTestProject/TestDataSourceExTests.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace FxExtensibilityTestProject;
diff --git a/test/IntegrationTests/TestAssets/HierarchyProject/ClassWithNoNamespace.cs b/test/IntegrationTests/TestAssets/HierarchyProject/ClassWithNoNamespace.cs
index 0e6cf14e52..c83e67d045 100644
--- a/test/IntegrationTests/TestAssets/HierarchyProject/ClassWithNoNamespace.cs
+++ b/test/IntegrationTests/TestAssets/HierarchyProject/ClassWithNoNamespace.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
[TestClass]
diff --git a/test/IntegrationTests/TestAssets/OutputTestProject/UnitTest1.cs b/test/IntegrationTests/TestAssets/OutputTestProject/UnitTest1.cs
index 247876bdea..db917d4c97 100644
--- a/test/IntegrationTests/TestAssets/OutputTestProject/UnitTest1.cs
+++ b/test/IntegrationTests/TestAssets/OutputTestProject/UnitTest1.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace OutputTestProject;
diff --git a/test/IntegrationTests/TestAssets/OutputTestProject/UnitTest2.cs b/test/IntegrationTests/TestAssets/OutputTestProject/UnitTest2.cs
index 3d7198907a..2d3d87ed80 100644
--- a/test/IntegrationTests/TestAssets/OutputTestProject/UnitTest2.cs
+++ b/test/IntegrationTests/TestAssets/OutputTestProject/UnitTest2.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace OutputTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleAssemblyInitializeAndCleanup.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleAssemblyInitializeAndCleanup.cs
index 072bcf6331..c2a6b40a74 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleAssemblyInitializeAndCleanup.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleAssemblyInitializeAndCleanup.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanup.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanup.cs
index a9cada8692..b191f7c8d1 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanup.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanup.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfAssembly.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfAssembly.cs
index ee640bb493..6d584cdb5a 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfAssembly.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfAssembly.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfAssemblyAndBeforeEachDerivedClass.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfAssemblyAndBeforeEachDerivedClass.cs
index ae8988aeef..0e45d85674 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfAssemblyAndBeforeEachDerivedClass.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfAssemblyAndBeforeEachDerivedClass.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfAssemblyAndNone.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfAssemblyAndNone.cs
index 504b64beec..98055d013c 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfAssemblyAndNone.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfAssemblyAndNone.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfClass.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfClass.cs
index 20f9522f73..eb43aa7ac3 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfClass.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfClass.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfClassAndBeforeEachDerivedClass.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfClassAndBeforeEachDerivedClass.cs
index d806abf283..5d9bff160e 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfClassAndBeforeEachDerivedClass.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfClassAndBeforeEachDerivedClass.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfClassAndNone.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfClassAndNone.cs
index fb41374bd0..3962444cde 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfClassAndNone.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassCleanupEndOfClassAndNone.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeAndCleanupBeforeEachDerivedClass.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeAndCleanupBeforeEachDerivedClass.cs
index be26e3774a..3027b699ce 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeAndCleanupBeforeEachDerivedClass.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeAndCleanupBeforeEachDerivedClass.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeAndCleanupNone.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeAndCleanupNone.cs
index c3d5f362da..98db71eb24 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeAndCleanupNone.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeAndCleanupNone.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeBeforeEachDerivedClassAndClassCleanupNone.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeBeforeEachDerivedClassAndClassCleanupNone.cs
index 228a1fbe5d..e72ec2729d 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeBeforeEachDerivedClassAndClassCleanupNone.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeBeforeEachDerivedClassAndClassCleanupNone.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeNoneAndClassCleanupBeforeEachDerivedClass.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeNoneAndClassCleanupBeforeEachDerivedClass.cs
index 17c99946f9..dbbd039655 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeNoneAndClassCleanupBeforeEachDerivedClass.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleClassInitializeNoneAndClassCleanupBeforeEachDerivedClass.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfAssemblyAndBeforeEachDerivedClass.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfAssemblyAndBeforeEachDerivedClass.cs
index efe957ff83..7e1a4d3eed 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfAssemblyAndBeforeEachDerivedClass.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfAssemblyAndBeforeEachDerivedClass.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfAssemblyAndNone.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfAssemblyAndNone.cs
index 591159cb6c..7d99058862 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfAssemblyAndNone.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfAssemblyAndNone.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfClassAndBeforeEachDerivedClass.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfClassAndBeforeEachDerivedClass.cs
index 2c621aea2e..b4147a157c 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfClassAndBeforeEachDerivedClass.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfClassAndBeforeEachDerivedClass.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfClassAndNone.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfClassAndNone.cs
index 9767ec81d6..12648249fc 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfClassAndNone.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassCleanupEndOfClassAndNone.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeAndCleanupBeforeEachDerivedClass.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeAndCleanupBeforeEachDerivedClass.cs
index e239ea472e..5669769de1 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeAndCleanupBeforeEachDerivedClass.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeAndCleanupBeforeEachDerivedClass.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeAndCleanupNone.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeAndCleanupNone.cs
index c4c53901fa..11749707a8 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeAndCleanupNone.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeAndCleanupNone.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeBeforeEachDerivedClassAndClassCleanupNone.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeBeforeEachDerivedClassAndClassCleanupNone.cs
index c97009c8be..3f83272a39 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeBeforeEachDerivedClassAndClassCleanupNone.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeBeforeEachDerivedClassAndClassCleanupNone.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeNoneAndClassCleanupBeforeEachDerivedClass.cs b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeNoneAndClassCleanupBeforeEachDerivedClass.cs
index 9087f8b2f0..fcb2b08bed 100644
--- a/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeNoneAndClassCleanupBeforeEachDerivedClass.cs
+++ b/test/IntegrationTests/TestAssets/SuiteLifeCycleTestProject/LifeCycleDerivedClassInitializeNoneAndClassCleanupBeforeEachDerivedClass.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace SuiteLifeCycleTestProject;
diff --git a/test/Performance/MSTest.Performance.Runner/Scenarios/Scenario1.cs b/test/Performance/MSTest.Performance.Runner/Scenarios/Scenario1.cs
index c9c4662bcf..75b456c5f7 100644
--- a/test/Performance/MSTest.Performance.Runner/Scenarios/Scenario1.cs
+++ b/test/Performance/MSTest.Performance.Runner/Scenarios/Scenario1.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Text;
using System.Xml.Linq;
using Microsoft.Testing.TestInfrastructure;
diff --git a/test/Performance/MSTest.Performance.Runner/Steps/ConcurrencyVisualizer.cs b/test/Performance/MSTest.Performance.Runner/Steps/ConcurrencyVisualizer.cs
index 5d0b04ed23..7f9a709b7a 100644
--- a/test/Performance/MSTest.Performance.Runner/Steps/ConcurrencyVisualizer.cs
+++ b/test/Performance/MSTest.Performance.Runner/Steps/ConcurrencyVisualizer.cs
@@ -1,11 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
using System.IO.Compression;
using System.Runtime.InteropServices;
-using System.Text;
namespace MSTest.Performance.Runner.Steps;
diff --git a/test/Performance/MSTest.Performance.Runner/Steps/DotnetTrace.cs b/test/Performance/MSTest.Performance.Runner/Steps/DotnetTrace.cs
index 70d7b95ceb..d9dc16dea7 100644
--- a/test/Performance/MSTest.Performance.Runner/Steps/DotnetTrace.cs
+++ b/test/Performance/MSTest.Performance.Runner/Steps/DotnetTrace.cs
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
using System.IO.Compression;
using System.Runtime.InteropServices;
diff --git a/test/Performance/MSTest.Performance.Runner/Steps/PerfviewRunner.cs b/test/Performance/MSTest.Performance.Runner/Steps/PerfviewRunner.cs
index d45e8b6d17..45afa35c68 100644
--- a/test/Performance/MSTest.Performance.Runner/Steps/PerfviewRunner.cs
+++ b/test/Performance/MSTest.Performance.Runner/Steps/PerfviewRunner.cs
@@ -1,11 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
using System.IO.Compression;
using System.Runtime.InteropServices;
-using System.Text;
namespace MSTest.Performance.Runner.Steps;
diff --git a/test/Performance/MSTest.Performance.Runner/Steps/PlainProcess.cs b/test/Performance/MSTest.Performance.Runner/Steps/PlainProcess.cs
index 6589d9f0d0..98c3708508 100644
--- a/test/Performance/MSTest.Performance.Runner/Steps/PlainProcess.cs
+++ b/test/Performance/MSTest.Performance.Runner/Steps/PlainProcess.cs
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
using System.IO.Compression;
using System.Text.Json;
diff --git a/test/Performance/MSTest.Performance.Runner/Steps/VSDiagnostics.cs b/test/Performance/MSTest.Performance.Runner/Steps/VSDiagnostics.cs
index ea821ecd39..fe075d103b 100644
--- a/test/Performance/MSTest.Performance.Runner/Steps/VSDiagnostics.cs
+++ b/test/Performance/MSTest.Performance.Runner/Steps/VSDiagnostics.cs
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
using System.IO.Compression;
using System.Runtime.InteropServices;
diff --git a/test/UnitTests/MSTest.Analyzers.UnitTests/NonNullableReferenceNotInitializedSuppressorTests.cs b/test/UnitTests/MSTest.Analyzers.UnitTests/NonNullableReferenceNotInitializedSuppressorTests.cs
index 32cff434a9..23d263569a 100644
--- a/test/UnitTests/MSTest.Analyzers.UnitTests/NonNullableReferenceNotInitializedSuppressorTests.cs
+++ b/test/UnitTests/MSTest.Analyzers.UnitTests/NonNullableReferenceNotInitializedSuppressorTests.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Diagnostics;
diff --git a/test/UnitTests/MSTest.Analyzers.UnitTests/UseAsyncSuffixTestFixtureMethodSuppressorTests.cs b/test/UnitTests/MSTest.Analyzers.UnitTests/UseAsyncSuffixTestFixtureMethodSuppressorTests.cs
index e55bdf9e1a..eddebfd38a 100644
--- a/test/UnitTests/MSTest.Analyzers.UnitTests/UseAsyncSuffixTestFixtureMethodSuppressorTests.cs
+++ b/test/UnitTests/MSTest.Analyzers.UnitTests/UseAsyncSuffixTestFixtureMethodSuppressorTests.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Diagnostics;
diff --git a/test/UnitTests/MSTest.Analyzers.UnitTests/UseAsyncSuffixTestMethodSuppressorTests.cs b/test/UnitTests/MSTest.Analyzers.UnitTests/UseAsyncSuffixTestMethodSuppressorTests.cs
index f5bced8a52..e40a874a3e 100644
--- a/test/UnitTests/MSTest.Analyzers.UnitTests/UseAsyncSuffixTestMethodSuppressorTests.cs
+++ b/test/UnitTests/MSTest.Analyzers.UnitTests/UseAsyncSuffixTestMethodSuppressorTests.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Diagnostics;
diff --git a/test/UnitTests/MSTest.Analyzers.UnitTests/Verifiers/CSharpCodeFixVerifier`2.cs b/test/UnitTests/MSTest.Analyzers.UnitTests/Verifiers/CSharpCodeFixVerifier`2.cs
index 7d98b387cf..16ff04edf8 100644
--- a/test/UnitTests/MSTest.Analyzers.UnitTests/Verifiers/CSharpCodeFixVerifier`2.cs
+++ b/test/UnitTests/MSTest.Analyzers.UnitTests/Verifiers/CSharpCodeFixVerifier`2.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.CodeFixes;
using Microsoft.CodeAnalysis.CSharp.Testing;
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Deployment/DeploymentItemTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Deployment/DeploymentItemTests.cs
index 89d7fd16d8..34b48cb028 100644
--- a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Deployment/DeploymentItemTests.cs
+++ b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Deployment/DeploymentItemTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/ThreadSafeStringWriterTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/ThreadSafeStringWriterTests.cs
index 69ae52a851..b7d18b5576 100644
--- a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/ThreadSafeStringWriterTests.cs
+++ b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/ThreadSafeStringWriterTests.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Globalization;
-
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
using TestFramework.ForTestingMSTest;
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/TraceListenerManagerTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/TraceListenerManagerTests.cs
index d95cadf0fa..50334027ac 100644
--- a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/TraceListenerManagerTests.cs
+++ b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Services/TraceListenerManagerTests.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if !WIN_UI
-using System.Diagnostics;
-using System.Text;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/DeploymentUtilityTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/DeploymentUtilityTests.cs
index ae47587921..09fcd7bd52 100644
--- a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/DeploymentUtilityTests.cs
+++ b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/DeploymentUtilityTests.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
diff --git a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/ns13DeploymentItemUtilityTests.cs b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/ns13DeploymentItemUtilityTests.cs
index dea08157df..ef07e223fd 100644
--- a/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/ns13DeploymentItemUtilityTests.cs
+++ b/test/UnitTests/MSTestAdapter.PlatformServices.UnitTests/Utilities/ns13DeploymentItemUtilityTests.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Discovery/AssemblyEnumeratorTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Discovery/AssemblyEnumeratorTests.cs
index b98e465b0c..61ea77d64a 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/Discovery/AssemblyEnumeratorTests.cs
+++ b/test/UnitTests/MSTestAdapter.UnitTests/Discovery/AssemblyEnumeratorTests.cs
@@ -2,10 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.ObjectModel;
-using System.Globalization;
-using System.Reflection;
-using System.Text;
-using System.Xml;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Discovery/AssemblyEnumeratorWrapperTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Discovery/AssemblyEnumeratorWrapperTests.cs
index 2fef0edc25..13e34b7e83 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/Discovery/AssemblyEnumeratorWrapperTests.cs
+++ b/test/UnitTests/MSTestAdapter.UnitTests/Discovery/AssemblyEnumeratorWrapperTests.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.UnitTests.TestableImplementations;
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Discovery/TestMethodValidatorTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Discovery/TestMethodValidatorTests.cs
index 5d0b135572..ef2d8b35b7 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/Discovery/TestMethodValidatorTests.cs
+++ b/test/UnitTests/MSTestAdapter.UnitTests/Discovery/TestMethodValidatorTests.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Discovery/TypeEnumeratorTests.MockedMethodInfoWithExtraAttributes.cs b/test/UnitTests/MSTestAdapter.UnitTests/Discovery/TypeEnumeratorTests.MockedMethodInfoWithExtraAttributes.cs
index d8a24c8b88..99d9772523 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/Discovery/TypeEnumeratorTests.MockedMethodInfoWithExtraAttributes.cs
+++ b/test/UnitTests/MSTestAdapter.UnitTests/Discovery/TypeEnumeratorTests.MockedMethodInfoWithExtraAttributes.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
-
#if !NET6_0_OR_GREATER
using Polyfills;
#endif
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Discovery/TypeValidatorTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Discovery/TypeValidatorTests.cs
index c08376ec22..68687c1bd7 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/Discovery/TypeValidatorTests.cs
+++ b/test/UnitTests/MSTestAdapter.UnitTests/Discovery/TypeValidatorTests.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Discovery;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/DynamicDataAttributeTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/DynamicDataAttributeTests.cs
index 037ee46cae..31645ffa69 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/DynamicDataAttributeTests.cs
+++ b/test/UnitTests/MSTestAdapter.UnitTests/DynamicDataAttributeTests.cs
@@ -2,9 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestExecutionManagerTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestExecutionManagerTests.cs
index 046f7d8ed8..bd6cf90af7 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestExecutionManagerTests.cs
+++ b/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestExecutionManagerTests.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestMethodInfoTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestMethodInfoTests.cs
index 70b8453cac..11078204c5 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestMethodInfoTests.cs
+++ b/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestMethodInfoTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
using System.Runtime.CompilerServices;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestMethodRunnerTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestMethodRunnerTests.cs
index 7041365e7d..ff5fb70d82 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestMethodRunnerTests.cs
+++ b/test/UnitTests/MSTestAdapter.UnitTests/Execution/TestMethodRunnerTests.cs
@@ -1,11 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-using System.Text;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Execution/TypeCacheTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Execution/TypeCacheTests.cs
index 1e0af49510..9ee66388d7 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/Execution/TypeCacheTests.cs
+++ b/test/UnitTests/MSTestAdapter.UnitTests/Execution/TypeCacheTests.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Execution/UnitTestRunnerTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Execution/UnitTestRunnerTests.cs
index d5d08b00ee..52524eabf9 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/Execution/UnitTestRunnerTests.cs
+++ b/test/UnitTests/MSTestAdapter.UnitTests/Execution/UnitTestRunnerTests.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
-using System.Xml;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Extensions/ExceptionExtensionsTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Extensions/ExceptionExtensionsTests.cs
index 79391029ec..4c37529ebf 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/Extensions/ExceptionExtensionsTests.cs
+++ b/test/UnitTests/MSTestAdapter.UnitTests/Extensions/ExceptionExtensionsTests.cs
@@ -1,9 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/Extensions/MethodInfoExtensionsTests.cs b/test/UnitTests/MSTestAdapter.UnitTests/Extensions/MethodInfoExtensionsTests.cs
index 9a0fe37271..254f7e0e35 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/Extensions/MethodInfoExtensionsTests.cs
+++ b/test/UnitTests/MSTestAdapter.UnitTests/Extensions/MethodInfoExtensionsTests.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
diff --git a/test/UnitTests/MSTestAdapter.UnitTests/TestableImplementations/TestablePlatformServiceProvider.cs b/test/UnitTests/MSTestAdapter.UnitTests/TestableImplementations/TestablePlatformServiceProvider.cs
index 96627190a9..fb039f6124 100644
--- a/test/UnitTests/MSTestAdapter.UnitTests/TestableImplementations/TestablePlatformServiceProvider.cs
+++ b/test/UnitTests/MSTestAdapter.UnitTests/TestableImplementations/TestablePlatformServiceProvider.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
diff --git a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/CrashDumpTests.cs b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/CrashDumpTests.cs
index 065485ff10..4f2b1640f2 100644
--- a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/CrashDumpTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/CrashDumpTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.Diagnostics;
using Microsoft.Testing.Extensions.Diagnostics.Resources;
using Microsoft.Testing.Extensions.UnitTests.Helpers;
diff --git a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/HangDumpTests.cs b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/HangDumpTests.cs
index 7c78930cef..461e4a861d 100644
--- a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/HangDumpTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/HangDumpTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.Diagnostics;
using Microsoft.Testing.Extensions.Diagnostics.Resources;
using Microsoft.Testing.Extensions.UnitTests.Helpers;
diff --git a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/Helpers/TestCommandLineOptions.cs b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/Helpers/TestCommandLineOptions.cs
index d999659995..00fabfa6d4 100644
--- a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/Helpers/TestCommandLineOptions.cs
+++ b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/Helpers/TestCommandLineOptions.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.Testing.Platform.CommandLine;
namespace Microsoft.Testing.Extensions.UnitTests.Helpers;
diff --git a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/Program.cs b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/Program.cs
index 5464028d18..d305bf7669 100644
--- a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/Program.cs
+++ b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/Program.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Reflection;
-
using Microsoft.Testing.Extensions;
[assembly: Parallelize(Scope = ExecutionScope.MethodLevel, Workers = 0)]
diff --git a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/RetryTests.cs b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/RetryTests.cs
index 5fe152714f..53f3b8f3d3 100644
--- a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/RetryTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/RetryTests.cs
@@ -3,8 +3,6 @@
// Licensed under dual-license. See LICENSE.PLATFORMTOOLS.txt file in the project root for full license information.
#pragma warning restore IDE0073 // The file header does not match the required text
-using System.Globalization;
-
using Microsoft.Testing.Extensions.Policy;
using Microsoft.Testing.Extensions.UnitTests.Helpers;
using Microsoft.Testing.Platform.Extensions.CommandLine;
diff --git a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/TrxCompareToolCommandLineTests.cs b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/TrxCompareToolCommandLineTests.cs
index e8e3005358..1a4160d843 100644
--- a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/TrxCompareToolCommandLineTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/TrxCompareToolCommandLineTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.TrxReport.Abstractions;
using Microsoft.Testing.Extensions.UnitTests.Helpers;
using Microsoft.Testing.Platform.Extensions.CommandLine;
diff --git a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/TrxTests.cs b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/TrxTests.cs
index 9ba22507da..fb3a22a4c4 100644
--- a/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/TrxTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Extensions.UnitTests/TrxTests.cs
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Text.RegularExpressions;
using System.Xml.Linq;
using Microsoft.Testing.Extensions.TrxReport.Abstractions;
diff --git a/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/CommandLine/RunSettingsCommandLineOptionsProviderTests.cs b/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/CommandLine/RunSettingsCommandLineOptionsProviderTests.cs
index b4e782d03f..1609ade663 100644
--- a/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/CommandLine/RunSettingsCommandLineOptionsProviderTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/CommandLine/RunSettingsCommandLineOptionsProviderTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.VSTestBridge.CommandLine;
using Microsoft.Testing.Extensions.VSTestBridge.Resources;
using Microsoft.Testing.Extensions.VSTestBridge.UnitTests.Helpers;
diff --git a/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/CommandLine/TestRunParameterCommandLineOptionsProviderTests.cs b/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/CommandLine/TestRunParameterCommandLineOptionsProviderTests.cs
index 06225f002d..c97d84f8ae 100644
--- a/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/CommandLine/TestRunParameterCommandLineOptionsProviderTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/CommandLine/TestRunParameterCommandLineOptionsProviderTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Extensions.VSTestBridge.CommandLine;
using Microsoft.Testing.Extensions.VSTestBridge.Resources;
using Microsoft.Testing.Extensions.VSTestBridge.UnitTests.Helpers;
diff --git a/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/Program.cs b/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/Program.cs
index 8c64d561f7..f9740d1c98 100644
--- a/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/Program.cs
+++ b/test/UnitTests/Microsoft.Testing.Extensions.VSTestBridge.UnitTests/Program.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Reflection;
-
using Microsoft.Testing.Extensions;
[assembly: Parallelize(Scope = ExecutionScope.MethodLevel, Workers = 0)]
diff --git a/test/UnitTests/Microsoft.Testing.Platform.MSBuild.UnitTests/Program.cs b/test/UnitTests/Microsoft.Testing.Platform.MSBuild.UnitTests/Program.cs
index 2057080ba4..c05ca317bd 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.MSBuild.UnitTests/Program.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.MSBuild.UnitTests/Program.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Reflection;
-
using Microsoft.Testing.Extensions;
[assembly: Parallelize(Scope = ExecutionScope.MethodLevel, Workers = 0)]
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/CommandLineTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/CommandLineTests.cs
index 7f426c4ef5..07468dc56c 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/CommandLineTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/CommandLineTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Reflection;
-
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions.CommandLine;
using Microsoft.Testing.Platform.Helpers;
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/PlatformCommandLineProviderTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/PlatformCommandLineProviderTests.cs
index bc1fb5ee9b..4ea02fad22 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/PlatformCommandLineProviderTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/CommandLine/PlatformCommandLineProviderTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Extensions.CommandLine;
using Microsoft.Testing.Platform.Resources;
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Configuration/AggregatedConfigurationTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Configuration/AggregatedConfigurationTests.cs
index 925ef3073f..77373844a9 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Configuration/AggregatedConfigurationTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Configuration/AggregatedConfigurationTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Configurations;
using Microsoft.Testing.Platform.Helpers;
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Configuration/ConfigurationManagerTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Configuration/ConfigurationManagerTests.cs
index 18faf51a91..5d73e93c9b 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Configuration/ConfigurationManagerTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Configuration/ConfigurationManagerTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Text;
-
using Microsoft.Testing.Platform.CommandLine;
using Microsoft.Testing.Platform.Configurations;
using Microsoft.Testing.Platform.Helpers;
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Helpers/SystemAsyncMonitorTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Helpers/SystemAsyncMonitorTests.cs
index a62f3bb5ed..d6d0daaa03 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Helpers/SystemAsyncMonitorTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Helpers/SystemAsyncMonitorTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
using Microsoft.Testing.Platform.Helpers;
namespace Microsoft.Testing.Platform.UnitTests;
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Helpers/TestCommandLineOptions.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Helpers/TestCommandLineOptions.cs
index 2020e0fbd4..f58fedb461 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Helpers/TestCommandLineOptions.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Helpers/TestCommandLineOptions.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.Testing.Platform.CommandLine;
namespace Microsoft.Testing.Platform.UnitTests.Helpers;
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Logging/FileLoggerTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Logging/FileLoggerTests.cs
index 53b2d03ecc..aaeb9dc6d0 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Logging/FileLoggerTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Logging/FileLoggerTests.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Text;
-
using Microsoft.Testing.Platform.Helpers;
using Microsoft.Testing.Platform.Logging;
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Logging/LoggerTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Logging/LoggerTests.cs
index 97852718f0..5818e30477 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Logging/LoggerTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Logging/LoggerTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-
using Microsoft.Testing.Platform.Logging;
using Moq;
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/OutputDevice/Terminal/TerminalTestReporterTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/OutputDevice/Terminal/TerminalTestReporterTests.cs
index 221fb03524..4c33b79bc2 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/OutputDevice/Terminal/TerminalTestReporterTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/OutputDevice/Terminal/TerminalTestReporterTests.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Runtime.InteropServices;
-using System.Text;
using Microsoft.Testing.Platform.Helpers;
using Microsoft.Testing.Platform.OutputDevice.Terminal;
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Program.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Program.cs
index ee46862285..70144a0569 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Program.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/Program.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Reflection;
-
using Microsoft.Testing.Extensions;
[assembly: Parallelize(Scope = ExecutionScope.MethodLevel, Workers = 0)]
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/ServerMode/FormatterUtilitiesTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/ServerMode/FormatterUtilitiesTests.cs
index 5f7440bc80..dc2fef3b58 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/ServerMode/FormatterUtilitiesTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/ServerMode/FormatterUtilitiesTests.cs
@@ -3,8 +3,6 @@
#pragma warning disable TPEXP // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-using System.Reflection;
-
using Microsoft.Testing.Platform.Extensions.Messages;
using Microsoft.Testing.Platform.ServerMode;
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/ServerMode/ServerTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/ServerMode/ServerTests.cs
index 36f0db185d..5eae561595 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/ServerMode/ServerTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/ServerMode/ServerTests.cs
@@ -3,7 +3,6 @@
using System.Net;
using System.Net.Sockets;
-using System.Text;
using Microsoft.Testing.Platform.Capabilities;
using Microsoft.Testing.Platform.Capabilities.TestFramework;
diff --git a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/TestApplicationBuilderTests.cs b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/TestApplicationBuilderTests.cs
index 547f65e403..27fde2ee59 100644
--- a/test/UnitTests/Microsoft.Testing.Platform.UnitTests/TestApplicationBuilderTests.cs
+++ b/test/UnitTests/Microsoft.Testing.Platform.UnitTests/TestApplicationBuilderTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.Testing.Platform.Configurations;
using Microsoft.Testing.Platform.Extensions.Messages;
using Microsoft.Testing.Platform.Extensions.TestHost;
diff --git a/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.AreEqualTests.cs b/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.AreEqualTests.cs
index 1f2be37f6d..e059628875 100644
--- a/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.AreEqualTests.cs
+++ b/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.AreEqualTests.cs
@@ -3,9 +3,6 @@
#nullable enable
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TestFramework.ForTestingMSTest;
diff --git a/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.InconclusiveTests.cs b/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.InconclusiveTests.cs
index cde2af40ff..d03c7555c6 100644
--- a/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.InconclusiveTests.cs
+++ b/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.InconclusiveTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Microsoft.VisualStudio.TestPlatform.TestFramework.UnitTests;
diff --git a/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.IsInstanceOfTypeTests.cs b/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.IsInstanceOfTypeTests.cs
index b532333130..fc2d51bf56 100644
--- a/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.IsInstanceOfTypeTests.cs
+++ b/test/UnitTests/TestFramework.UnitTests/Assertions/AssertTests.IsInstanceOfTypeTests.cs
@@ -3,8 +3,6 @@
#nullable enable
-using System.Diagnostics.CodeAnalysis;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
namespace Microsoft.VisualStudio.TestPlatform.TestFramework.UnitTests;
diff --git a/test/UnitTests/TestFramework.UnitTests/Assertions/StringAssertTests.cs b/test/UnitTests/TestFramework.UnitTests/Assertions/StringAssertTests.cs
index 21ef26548d..f910b5acd1 100644
--- a/test/UnitTests/TestFramework.UnitTests/Assertions/StringAssertTests.cs
+++ b/test/UnitTests/TestFramework.UnitTests/Assertions/StringAssertTests.cs
@@ -3,9 +3,6 @@
#nullable enable
-using System.Diagnostics.CodeAnalysis;
-using System.Text.RegularExpressions;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
using TestFramework.ForTestingMSTest;
diff --git a/test/UnitTests/TestFramework.UnitTests/Attributes/DataRowAttributeTests.cs b/test/UnitTests/TestFramework.UnitTests/Attributes/DataRowAttributeTests.cs
index b585158ef6..26657b16c4 100644
--- a/test/UnitTests/TestFramework.UnitTests/Attributes/DataRowAttributeTests.cs
+++ b/test/UnitTests/TestFramework.UnitTests/Attributes/DataRowAttributeTests.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Reflection;
-
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
diff --git a/test/Utilities/Automation.CLI/DiscoveryEventsHandler.cs b/test/Utilities/Automation.CLI/DiscoveryEventsHandler.cs
index e21e5553ec..6c1b1a7cbf 100644
--- a/test/Utilities/Automation.CLI/DiscoveryEventsHandler.cs
+++ b/test/Utilities/Automation.CLI/DiscoveryEventsHandler.cs
@@ -4,7 +4,6 @@
#nullable enable
using System.Collections.Immutable;
-using System.Diagnostics.CodeAnalysis;
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/CommandLine.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/CommandLine.cs
index 73693a1896..baad841ddc 100644
--- a/test/Utilities/Microsoft.Testing.TestInfrastructure/CommandLine.cs
+++ b/test/Utilities/Microsoft.Testing.TestInfrastructure/CommandLine.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.ObjectModel;
-using System.Diagnostics.CodeAnalysis;
namespace Microsoft.Testing.TestInfrastructure;
diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/DebuggerUtility.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/DebuggerUtility.cs
index ddb5ed161b..863ee70f67 100644
--- a/test/Utilities/Microsoft.Testing.TestInfrastructure/DebuggerUtility.cs
+++ b/test/Utilities/Microsoft.Testing.TestInfrastructure/DebuggerUtility.cs
@@ -4,10 +4,6 @@
#pragma warning disable CA1837 // Use 'Environment.ProcessId'
#pragma warning disable CA1416 // Validate platform compatibility
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Globalization;
-using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using System.Runtime.InteropServices.ComTypes;
diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetCli.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetCli.cs
index be08498905..ecd758c20b 100644
--- a/test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetCli.cs
+++ b/test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetCli.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections;
-using System.Diagnostics.CodeAnalysis;
using Polly;
using Polly.Contrib.WaitAndRetry;
diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetMuxerResult.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetMuxerResult.cs
index 589972d538..a02d2ba47a 100644
--- a/test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetMuxerResult.cs
+++ b/test/Utilities/Microsoft.Testing.TestInfrastructure/DotnetMuxerResult.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.ObjectModel;
-using System.Globalization;
-using System.Text;
namespace Microsoft.Testing.TestInfrastructure;
diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/ProcessFactory.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/ProcessFactory.cs
index 4b8d554e4d..4b2e600823 100644
--- a/test/Utilities/Microsoft.Testing.TestInfrastructure/ProcessFactory.cs
+++ b/test/Utilities/Microsoft.Testing.TestInfrastructure/ProcessFactory.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
namespace Microsoft.Testing.TestInfrastructure;
public static class ProcessFactory
diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/ProcessHandle.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/ProcessHandle.cs
index f6d4d5c172..fb32b027b3 100644
--- a/test/Utilities/Microsoft.Testing.TestInfrastructure/ProcessHandle.cs
+++ b/test/Utilities/Microsoft.Testing.TestInfrastructure/ProcessHandle.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-
namespace Microsoft.Testing.TestInfrastructure;
public sealed class ProcessHandle : IProcessHandle, IDisposable
diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/ProjectSystem.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/ProjectSystem.cs
index a15bbf5485..5ff904b01e 100644
--- a/test/Utilities/Microsoft.Testing.TestInfrastructure/ProjectSystem.cs
+++ b/test/Utilities/Microsoft.Testing.TestInfrastructure/ProjectSystem.cs
@@ -1,8 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Globalization;
-using System.Text;
using System.Xml.Linq;
namespace Microsoft.Testing.TestInfrastructure;
diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/TestHost.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/TestHost.cs
index 60676a556a..2576a57b6f 100644
--- a/test/Utilities/Microsoft.Testing.TestInfrastructure/TestHost.cs
+++ b/test/Utilities/Microsoft.Testing.TestInfrastructure/TestHost.cs
@@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections;
-using System.Diagnostics.CodeAnalysis;
using System.Runtime.InteropServices;
using Polly;
diff --git a/test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs b/test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs
index 31f86f2d16..6cdb8a76da 100644
--- a/test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs
+++ b/test/Utilities/Microsoft.Testing.TestInfrastructure/TestHostResult.cs
@@ -2,8 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Collections.ObjectModel;
-using System.Globalization;
-using System.Text;
namespace Microsoft.Testing.TestInfrastructure;
diff --git a/test/Utilities/TestFramework.ForTestingMSTest/AdapterToTestPlatform.cs b/test/Utilities/TestFramework.ForTestingMSTest/AdapterToTestPlatform.cs
index 16b511b637..82f19d1675 100644
--- a/test/Utilities/TestFramework.ForTestingMSTest/AdapterToTestPlatform.cs
+++ b/test/Utilities/TestFramework.ForTestingMSTest/AdapterToTestPlatform.cs
@@ -1,10 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
-using System.Reflection;
-
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
diff --git a/test/Utilities/TestFramework.ForTestingMSTest/TestContainer.cs b/test/Utilities/TestFramework.ForTestingMSTest/TestContainer.cs
index c242c4a119..524d4c0d98 100644
--- a/test/Utilities/TestFramework.ForTestingMSTest/TestContainer.cs
+++ b/test/Utilities/TestFramework.ForTestingMSTest/TestContainer.cs
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-using System.Diagnostics.CodeAnalysis;
using System.Runtime.CompilerServices;
namespace TestFramework.ForTestingMSTest;