Move TATF based tests to MSTest

Directory.Packages.props

@@ -25,6 +25,7 @@
   </PropertyGroup>
   <PropertyGroup Label="Test dependencies">
     <MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.3-beta1.24423.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
+    <MSTestVersion>3.8.0-preview.24616.6</MSTestVersion>
   </PropertyGroup>
   <ItemGroup Label="Analyzers">
     <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="$(MicrosoftCodeAnalysisBannedApiAnalyzersVersion)" />
@@ -65,12 +66,13 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="$(MicrosoftCodeAnalysisAnalyzerTestingVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeRefactoring.Testing" Version="$(MicrosoftCodeAnalysisAnalyzerTestingVersion)" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0" />
-    <PackageVersion Include="Microsoft.Testing.Internal.Framework" Version="$(MicrosoftTestingInternalFrameworkVersion)" />
-    <PackageVersion Include="Microsoft.Testing.Internal.Framework.SourceGeneration" Version="$(MicrosoftTestingInternalFrameworkVersion)" />
     <PackageVersion Include="Microsoft.TestPlatform" Version="$(MicrosoftNETTestSdkVersion)" />
     <!-- Pinned to 4.18.4 for security -->
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.386" />
+    <PackageVersion Include="MSTest.Analyzers" Version="$(MSTestVersion)" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="$(MSTestVersion)" />
+    <PackageVersion Include="MSTest.TestFramework" Version="$(MSTestVersion)" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <!-- CVE-2024-0057 / Transitive deps of code analysis testing packages -->
     <PackageVersion Include="NuGet.Packaging" Version="6.12.1" />

src/Adapter/MSTestAdapter.PlatformServices/Services/TestDataSource.cs

@@ -9,12 +9,11 @@
 
 using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Data;
 using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Extensions;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 #endif
 using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using ITestDataSource = Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface.ITestDataSource;
-using UTF = Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
 
@@ -36,9 +35,9 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
 public class TestDataSource : ITestDataSource
 {
 #if NETFRAMEWORK
-    public IEnumerable<object>? GetData(UTF.ITestMethod testMethodInfo, ITestContext testContext)
+    public IEnumerable<object>? GetData(ITestMethod testMethodInfo, ITestContext testContext)
 #else
-    IEnumerable<object>? ITestDataSource.GetData(UTF.ITestMethod testMethodInfo, ITestContext testContext)
+    IEnumerable<object>? ITestDataSource.GetData(ITestMethod testMethodInfo, ITestContext testContext)
 #endif
     {
 #if NETFRAMEWORK
@@ -49,12 +48,12 @@ public class TestDataSource : ITestDataSource
             Path.GetDirectoryName(new Uri(testMethodInfo.MethodInfo.Module.Assembly.CodeBase).LocalPath),
         ];
 
-        List<UTF.TestResult> dataRowResults = [];
+        List<TestResult> dataRowResults = [];
 
         // Connect to data source.
         TestDataConnectionFactory factory = new();
 
-        GetConnectionProperties(testMethodInfo.GetAttributes<UTF.DataSourceAttribute>(false)[0], out string providerNameInvariant, out string? connectionString, out string? tableName, out UTF.DataAccessMethod dataAccessMethod);
+        GetConnectionProperties(testMethodInfo.GetAttributes<DataSourceAttribute>(false)[0], out string providerNameInvariant, out string? connectionString, out string? tableName, out DataAccessMethod dataAccessMethod);
 
         try
         {
@@ -103,7 +102,7 @@ public class TestDataSource : ITestDataSource
     /// <param name="dataAccessMethod">The data access method.</param>
     /// <param name="length">Number of permutations.</param>
     /// <returns>Permutations.</returns>
-    private static IEnumerable<int> GetPermutation(UTF.DataAccessMethod dataAccessMethod, int length)
+    private static IEnumerable<int> GetPermutation(DataAccessMethod dataAccessMethod, int length)
     {
         switch (dataAccessMethod)
         {
@@ -127,8 +126,8 @@ private static IEnumerable<int> GetPermutation(UTF.DataAccessMethod dataAccessMe
     /// <param name="connectionString">The connection string.</param>
     /// <param name="tableName">The table name.</param>
     /// <param name="dataAccessMethod">The data access method.</param>
-    private static void GetConnectionProperties(UTF.DataSourceAttribute dataSourceAttribute, out string providerNameInvariant,
-        out string? connectionString, out string? tableName, out UTF.DataAccessMethod dataAccessMethod)
+    private static void GetConnectionProperties(DataSourceAttribute dataSourceAttribute, out string providerNameInvariant,
+        out string? connectionString, out string? tableName, out DataAccessMethod dataAccessMethod)
     {
         if (StringEx.IsNullOrEmpty(dataSourceAttribute.DataSourceSettingName))
         {
@@ -139,7 +138,7 @@ private static void GetConnectionProperties(UTF.DataSourceAttribute dataSourceAt
             return;
         }
 
-        UTF.DataSourceElement element = TestConfiguration.ConfigurationSection.DataSources[dataSourceAttribute.DataSourceSettingName]
+        DataSourceElement element = TestConfiguration.ConfigurationSection.DataSources[dataSourceAttribute.DataSourceSettingName]
 #pragma warning disable CA2201 // Do not raise reserved exception types
             ?? throw new Exception(string.Format(CultureInfo.CurrentCulture, Resource.UTA_DataSourceConfigurationSectionMissing, dataSourceAttribute.DataSourceSettingName));
 #pragma warning restore CA2201 // Do not raise reserved exception types

src/Adapter/MSTestAdapter.PlatformServices/Utilities/FileUtility.cs

@@ -86,7 +86,7 @@ public virtual string GetNextIterationDirectoryName(string parentDirectoryName,
     /// Returns empty string on error when specified to continue the run on error,
     /// throw on error when specified to abort the run on error.
     /// </returns>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Requirement is to handle all kinds of user exceptions and message appropriately.")]
+    [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Requirement is to handle all kinds of user exceptions and message appropriately.")]
     public virtual string CopyFileOverwrite(string source, string destination, out string? warning)
     {
         DebugEx.Assert(!StringEx.IsNullOrEmpty(source), "source should not be null.");
@@ -224,7 +224,7 @@ public static string TryConvertPathToRelative(string path, string rootDir)
     /// them.
     /// </summary>
     /// <param name="filePath">The root directory to clear.</param>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Requirement is to handle all kinds of user exceptions and message appropriately.")]
+    [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Requirement is to handle all kinds of user exceptions and message appropriately.")]
     public virtual void DeleteDirectories(string filePath)
     {
         Guard.NotNullOrWhiteSpace(filePath);
@@ -255,7 +255,7 @@ public virtual void DeleteDirectories(string filePath)
     /// </summary>
     /// <param name="path">path to symbols file.</param>
     /// <returns>Pdb file name or null if non-existent.</returns>
-    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Requirement is to handle all kinds of user exceptions and message appropriately.")]
+    [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes", Justification = "Requirement is to handle all kinds of user exceptions and message appropriately.")]
     private static string? GetSymbolsFileName(string? path)
     {
         if (StringEx.IsNullOrEmpty(path) || path.IndexOfAny(Path.GetInvalidPathChars()) != -1)

src/Analyzers/MSTest.Analyzers/RoslynAnalyzerHelpers/WellKnownTypeProvider.cs

@@ -171,12 +171,12 @@ private bool TryGetOrCreateTypeByMetadataNameSlow(
     }
 
     /// <summary>
-    /// Determines if <paramref name="typeSymbol"/> is a <see cref="System.Threading.Tasks.Task{TResult}"/> with its type
+    /// Determines if <paramref name="typeSymbol"/> is a <see cref="Task{TResult}"/> with its type
     /// argument satisfying <paramref name="typeArgumentPredicate"/>.
     /// </summary>
-    /// <param name="typeSymbol">Type potentially representing a <see cref="System.Threading.Tasks.Task{TResult}"/>.</param>
+    /// <param name="typeSymbol">Type potentially representing a <see cref="Task{TResult}"/>.</param>
     /// <param name="typeArgumentPredicate">Predicate to check the <paramref name="typeSymbol"/>'s type argument.</param>
-    /// <returns>True if <paramref name="typeSymbol"/> is a <see cref="System.Threading.Tasks.Task{TResult}"/> with its
+    /// <returns>True if <paramref name="typeSymbol"/> is a <see cref="Task{TResult}"/> with its
     /// type argument satisfying <paramref name="typeArgumentPredicate"/>, false otherwise.</returns>
     internal bool IsTaskOfType([NotNullWhen(returnValue: true)] ITypeSymbol? typeSymbol, Func<ITypeSymbol, bool> typeArgumentPredicate)
         => typeSymbol != null

src/Platform/Microsoft.Testing.Extensions.CrashDump/Microsoft.Testing.Extensions.CrashDump.csproj

@@ -42,7 +42,6 @@ This package extends Microsoft Testing Platform to provide a crash dump function
 
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.Testing.Extensions.VSTestBridge" Key="$(VsPublicKey)" />
-    <InternalsVisibleTo Include="Microsoft.Testing.Internal.Framework" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="Microsoft.Testing.Extensions.HangDump" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="Microsoft.Testing.Extensions.UnitTests" Key="$(VsPublicKey)" />
   </ItemGroup>

src/Platform/Microsoft.Testing.Extensions.TrxReport/Microsoft.Testing.Extensions.TrxReport.csproj

@@ -50,7 +50,6 @@ This package extends Microsoft Testing Platform to provide TRX test reports.]]>
   <ItemGroup>
     <InternalsVisibleTo Include="Microsoft.Testing.Extensions.UnitTests" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="Microsoft.Testing.Extensions.VSTestBridge" Key="$(VsPublicKey)" />
-    <InternalsVisibleTo Include="Microsoft.Testing.Internal.Framework" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="Microsoft.Testing.Extensions.HangDump" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="Microsoft.Testing.Extensions.UnitTests" Key="$(VsPublicKey)" />
   </ItemGroup>

src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Microsoft.Testing.Extensions.VSTestBridge.csproj

@@ -5,8 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="Microsoft.Testing.Internal.Framework" Key="$(VsPublicKey)" />
-    <InternalsVisibleTo Include="Microsoft.Testing.Internal.Framework.UnitTests" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="MSTest.TestAnywhereAdapter" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="Microsoft.Testing.Extensions.VSTestBridge.UnitTests" Key="$(VsPublicKey)" />
   </ItemGroup>

src/Platform/Microsoft.Testing.Extensions.VSTestBridge/ObjectModel/FastFilter.cs

@@ -195,14 +195,15 @@ private void AddProperty(string name, string value)
         {
             if (!_filterDictionaryBuilder.TryGetValue(name, out ImmutableHashSet<string>.Builder? values))
             {
-                values = ImmutableHashSet.CreateBuilder<string>(StringComparer.OrdinalIgnoreCase);
+                values = ImmutableHashSet.CreateBuilder(StringComparer.OrdinalIgnoreCase)!;
                 _filterDictionaryBuilder.Add(name, values);
             }
 
             values.Add(value);
         }
 
-        internal FastFilter? ToFastFilter() => ContainsValidFilter
+        internal FastFilter? ToFastFilter()
+            => ContainsValidFilter
                 ? new FastFilter(
                     _filterDictionaryBuilder.ToImmutableDictionary(kvp => kvp.Key, kvp => (ISet<string>)_filterDictionaryBuilder[kvp.Key].ToImmutable()),
                     _fastFilterOperation,

src/Platform/Microsoft.Testing.Platform/Microsoft.Testing.Platform.csproj

@@ -63,8 +63,6 @@ This package provides the core platform and the .NET implementation of the proto
     <InternalsVisibleTo Include="Microsoft.Testing.Extensions.VSTestBridge" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="Microsoft.Testing.Extensions.VSTestBridge.TestAdapter" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="Microsoft.Testing.Extensions.VSTestBridge.UnitTests" Key="$(VsPublicKey)" />
-    <InternalsVisibleTo Include="Microsoft.Testing.Internal.Framework" Key="$(VsPublicKey)" />
-    <InternalsVisibleTo Include="Microsoft.Testing.Internal.Framework.UnitTests" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="Microsoft.Testing.Platform.Acceptance.IntegrationTests" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="Microsoft.Testing.Platform.MSBuild" Key="$(VsPublicKey)" />
     <InternalsVisibleTo Include="Microsoft.Testing.Platform.UnitTests" Key="$(VsPublicKey)" />

src/Platform/Microsoft.Testing.Platform/ServerMode/JsonRpc/SerializerUtilities.cs

@@ -218,10 +218,10 @@ static SerializerUtilities()
 #if NETCOREAPP
                         properties[namedKvpStringProperty.Name] = namedKvpStringProperty.Pairs;
 #else
-                        Jsonite.JsonArray collection = [];
+                        JsonArray collection = [];
                         foreach (KeyValuePair<string, string> item in namedKvpStringProperty.Pairs)
                         {
-                            Jsonite.JsonObject o = new()
+                            JsonObject o = new()
                             {
                                 { item.Key, item.Value },
                             };
@@ -419,10 +419,10 @@ static SerializerUtilities()
 #if NETCOREAPP
                 values[JsonRpcStrings.EnvironmentVariables] = ev.EnvironmentVariables;
 #else
-                Jsonite.JsonArray collection = [];
+                JsonArray collection = [];
                 foreach (KeyValuePair<string, string?> item in ev.EnvironmentVariables)
                 {
-                    Jsonite.JsonObject o = new()
+                    JsonObject o = new()
                     {
                         { item.Key, item.Value },
                     };

src/TestFramework/TestFramework.Extensions/ConfigurationSettings/TestConfigurationSection.cs

@@ -24,7 +24,7 @@ public sealed class TestConfigurationSection : ConfigurationSection
     /// Gets the collection of properties.
     /// </summary>
     /// <returns>
-    /// The <see cref="System.Configuration.ConfigurationPropertyCollection"/> of properties for the element.
+    /// The <see cref="ConfigurationPropertyCollection"/> of properties for the element.
     /// </returns>
     protected override ConfigurationPropertyCollection Properties { get; } = [DataSourcesValue];
 }