Avoid IVT between test framework and adapter

src/Adapter/MSTest.TestAdapter/Discovery/AssemblyEnumerator.cs

@@ -79,8 +79,10 @@ internal AssemblyEnumerationResult EnumerateAssembly(string assemblyFileName)
 
         // Set the test ID generation strategy for DataRowAttribute and DynamicDataAttribute so we can improve display name without
         // causing a breaking change.
+#pragma warning disable CS0618 // Type or member is obsolete
         DataRowAttribute.TestIdGenerationStrategy = testIdGenerationStrategy;
         DynamicDataAttribute.TestIdGenerationStrategy = testIdGenerationStrategy;
+#pragma warning restore CS0618 // Type or member is obsolete
 
         TestDataSourceUnfoldingStrategy dataSourcesUnfoldingStrategy = ReflectHelper.GetTestDataSourceOptions(assembly)?.UnfoldingStrategy switch
         {
@@ -388,7 +390,9 @@ private static bool TryUnfoldITestDataSources(UnitTestElement test, DiscoveryTes
         }
     }
 
+#pragma warning disable CS0618 // Type or member is obsolete
     private static bool TryUnfoldITestDataSource(ITestDataSource dataSource, TestDataSourceUnfoldingStrategy dataSourcesUnfoldingStrategy, UnitTestElement test, ReflectionTestMethodInfo methodInfo, List<UnitTestElement> tests)
+#pragma warning restore CS0618 // Type or member is obsolete
     {
         var unfoldingCapability = dataSource as ITestDataSourceUnfoldingCapability;
 

src/Adapter/MSTest.TestAdapter/Execution/TestAssemblySettingsProvider.cs

@@ -38,8 +38,10 @@ internal TestAssemblySettings GetSettings(string source)
 
         // Set the test ID generation strategy for DataRowAttribute and DynamicDataAttribute so we can improve display name without
         // causing a breaking change.
+#pragma warning disable CS0618 // Type or member is obsolete
         DataRowAttribute.TestIdGenerationStrategy = testIdGenerationStrategy;
         DynamicDataAttribute.TestIdGenerationStrategy = testIdGenerationStrategy;
+#pragma warning restore CS0618 // Type or member is obsolete
 
         ParallelizeAttribute? parallelizeAttribute = ReflectHelper.GetParallelizeAttribute(testAssembly);
 

src/Adapter/MSTest.TestAdapter/Execution/TestMethodRunner.cs

@@ -63,7 +63,7 @@
     /// <returns>The test results.</returns>
     internal async Task<TestResult[]> ExecuteAsync(string initializationLogs, string initializationErrorLogs, string initializationTrace, string initializationTestContextMessages)
     {
         _testContext.Context.TestRunCount++;
         bool isSTATestClass = AttributeComparer.IsDerived<STATestClassAttribute>(_testMethodInfo.Parent.ClassAttribute);
         bool isSTATestMethod = AttributeComparer.IsDerived<STATestMethodAttribute>(_testMethodInfo.Executor);
         bool isSTARequested = isSTATestClass || isSTATestMethod;
@@ -174,7 +174,7 @@
             if (_test.TestDataSourceIgnoreMessage is not null)
             {
                 _testContext.SetOutcome(UTF.UnitTestOutcome.Ignored);
-                return [TestResult.CreateIgnoredResult(_test.TestDataSourceIgnoreMessage)];
+                return [TestResultHelpers.CreateIgnoredResult(_test.TestDataSourceIgnoreMessage)];
             }
 
             object?[]? data = DataSerializationHelper.Deserialize(_test.SerializedData);
@@ -272,7 +272,7 @@
         {
             if (testDataSource is ITestDataSourceIgnoreCapability { IgnoreMessage: { } ignoreMessage })
             {
-                results.Add(TestResult.CreateIgnoredResult(ignoreMessage));
+                results.Add(TestResultHelpers.CreateIgnoredResult(ignoreMessage));
                 continue;
             }
 
@@ -396,19 +396,21 @@
             data = tupleExpandedToArray;
         }
 
+#pragma warning disable CS0618 // Type or member is obsolete
         displayName = testDataSource != null
             ? displayNameFromTestDataRow
                 ?? testDataSource.GetDisplayName(new ReflectionTestMethodInfo(_testMethodInfo.MethodInfo, _test.DisplayName), data)
                 ?? displayName
             : displayNameFromTestDataRow ?? displayName;
+#pragma warning restore CS0618 // Type or member is obsolete
 
         var stopwatch = Stopwatch.StartNew();
         _testMethodInfo.SetArguments(data);
         _testContext.SetTestData(data);
         _testContext.SetDisplayName(displayName);
 
         TestResult[] testResults = ignoreFromTestDataRow is not null
-            ? [TestResult.CreateIgnoredResult(ignoreFromTestDataRow)]
+            ? [TestResultHelpers.CreateIgnoredResult(ignoreFromTestDataRow)]
             : await ExecuteTestAsync(_testMethodInfo);
 
         stopwatch.Stop();

src/Adapter/MSTest.TestAdapter/Execution/TestResultHelpers.cs

@@ -0,0 +1,16 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Execution;
+
+internal static class TestResultHelpers
+{
+    internal static TestResult CreateIgnoredResult(string? ignoreReason)
+        => new()
+        {
+            Outcome = UnitTestOutcome.Ignored,
+            IgnoreReason = ignoreReason,
+        };
+}

src/Adapter/MSTest.TestAdapter/Execution/UnitTestRunner.cs

@@ -193,17 +193,17 @@
                         RetryBaseAttribute? retryAttribute = testMethodInfo.RetryAttribute;
                         var testMethodRunner = new TestMethodRunner(testMethodInfo, testMethod, testContextForTestExecution);
                         result = await testMethodRunner.ExecuteAsync(classInitializeResult.LogOutput!, classInitializeResult.LogError!, classInitializeResult.DebugTrace!, classInitializeResult.TestContextMessages!);
                         if (retryAttribute is not null && !RetryBaseAttribute.IsAcceptableResultForRetry(result))
                         {
                             RetryResult retryResult = await retryAttribute.ExecuteAsync(
                                 new RetryContext(
                                     async () => await testMethodRunner.ExecuteAsync(
                                         classInitializeResult.LogOutput!,
                                         classInitializeResult.LogError!,
                                         classInitializeResult.DebugTrace!,
                                         classInitializeResult.TestContextMessages!), result));
 
                             result = retryResult.TryGetLast() ?? throw ApplicationStateGuard.Unreachable();
                         }
                     }
                 }
@@ -228,7 +228,7 @@
                 new TestResult
                 {
                     Outcome = UnitTestOutcome.Failed,
                     IgnoreReason = ex.Message,
                 }
             ];
         }
@@ -427,7 +427,7 @@
         if (shouldIgnoreClass || shouldIgnoreMethod)
         {
             notRunnableResult =
-                [TestResult.CreateIgnoredResult(ignoreMessage)];
+                [TestResultHelpers.CreateIgnoredResult(ignoreMessage)];
             return false;
         }
 

src/Adapter/MSTestAdapter.PlatformServices/MSTestAdapter.PlatformServices.csproj

@@ -40,8 +40,15 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.TestPlatform.ObjectModel" />
+    <PackageReference Include="Polyfill" PrivateAssets="all" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="$(RepoRoot)src\TestFramework\TestFramework\Internal\StringEx.cs" Link="Internal\StringEx" />
+    <Compile Include="$(RepoRoot)src\TestFramework\TestFramework\Internal\DebugEx.cs" Link="Internal\DebugEx.cs" />
+    <Compile Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestContextConstants.cs" Link="TestFramework.Extensions" />
+  </ItemGroup>
+
   <PropertyGroup>
     <!-- Enable AOT analyzer warnings to make sure we don't call APIs that would fail when we use source generator mode together with NativeAOT. -->
     <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>

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

@@ -61,7 +61,7 @@ public void Load(XmlReader reader)
     /// <param name="source">The source.</param>
     /// <returns>A collection of properties.</returns>
     public IDictionary<string, object> GetProperties(string? source)
-#if !WINDOWS_UWP
+#if !WINDOWS_UWP && !WIN_UI
         => TestDeployment.GetDeploymentInformation(source);
 #else
         => new Dictionary<string, object>();

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

@@ -99,10 +99,10 @@ public TestContextImplementation(ITestMethod? testMethod, StringWriter stringWri
             ? new Dictionary<string, object?>(properties)
             : new Dictionary<string, object?>(properties)
             {
-                [FullyQualifiedTestClassNameLabel] = testMethod.FullClassName,
-                [ManagedTypeLabel] = testMethod.ManagedTypeName,
-                [ManagedMethodLabel] = testMethod.ManagedMethodName,
-                [TestNameLabel] = testMethod.Name,
+                [TestContextConstants.FullyQualifiedTestClassNameLabel] = testMethod.FullClassName,
+                [TestContextConstants.ManagedTypeLabel] = testMethod.ManagedTypeName,
+                [TestContextConstants.ManagedMethodLabel] = testMethod.ManagedMethodName,
+                [TestContextConstants.TestNameLabel] = testMethod.Name,
             };
 
         _testResultFiles = [];

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

@@ -1,19 +1,19 @@
 // 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
+#if !WINDOWS_UWP && !WIN_UI
 using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
 #endif
 using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
-#if !WINDOWS_UWP
+#if !WINDOWS_UWP && !WIN_UI
 using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Utilities;
 #endif
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 #if NETFRAMEWORK
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Utilities;
 #endif
-#if !WINDOWS_UWP
+#if !WINDOWS_UWP && !WIN_UI
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 #endif
 
@@ -29,7 +29,7 @@ namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
 #endif
 public class TestDeployment : ITestDeployment
 {
-#if !WINDOWS_UWP
+#if !WINDOWS_UWP && !WIN_UI
     #region Service Utility Variables
 
     private readonly DeploymentItemUtility _deploymentItemUtility;
@@ -80,7 +80,7 @@ internal TestDeployment(DeploymentItemUtility deploymentItemUtility, DeploymentU
     /// <param name="warnings"> The warnings. </param>
     /// <returns> A string of deployment items. </returns>
     public KeyValuePair<string, string>[]? GetDeploymentItems(MethodInfo method, Type type, ICollection<string> warnings) =>
-#if WINDOWS_UWP
+#if WINDOWS_UWP || WIN_UI
         null;
 #else
         _deploymentItemUtility.GetDeploymentItems(method, _deploymentItemUtility.GetClassLevelDeploymentItems(type, warnings), warnings);
@@ -91,7 +91,7 @@ internal TestDeployment(DeploymentItemUtility deploymentItemUtility, DeploymentU
     /// </summary>
     public void Cleanup()
     {
-#if !WINDOWS_UWP
+#if !WINDOWS_UWP && !WIN_UI
         // Delete the deployment directory
         if (RunDirectories != null && _adapterSettings?.DeleteDeploymentDirectoryAfterTestRunIsComplete == true)
         {
@@ -109,7 +109,7 @@ public void Cleanup()
     /// </summary>
     /// <returns> The deployment output directory. </returns>
     public string? GetDeploymentDirectory() =>
-#if WINDOWS_UWP
+#if WINDOWS_UWP || WIN_UI
         null;
 #else
         RunDirectories?.OutDirectory;
@@ -125,7 +125,7 @@ public void Cleanup()
     [SuppressMessage("Naming", "CA1725:Parameter names should match base declaration", Justification = "Part of the public API")]
     public bool Deploy(IEnumerable<TestCase> tests, IRunContext? runContext, IFrameworkHandle frameworkHandle)
     {
-#if WINDOWS_UWP
+#if WINDOWS_UWP || WIN_UI
         return false;
 #else
         DebugEx.Assert(tests != null, "tests");
@@ -178,7 +178,7 @@ group test by test.Source into testGroup
 #endif
     }
 
-#if !WINDOWS_UWP
+#if !WINDOWS_UWP && !WIN_UI
     internal static IDictionary<string, object> GetDeploymentInformation(string? source)
     {
         var properties = new Dictionary<string, object>(capacity: 8);
@@ -192,15 +192,15 @@ internal static IDictionary<string, object> GetDeploymentInformation(string? sou
             applicationBaseDirectory = Path.GetDirectoryName(source)!;
         }
 
-        properties[TestContext.TestRunDirectoryLabel] = RunDirectories?.RootDeploymentDirectory ?? applicationBaseDirectory;
-        properties[TestContext.DeploymentDirectoryLabel] = RunDirectories?.OutDirectory ?? applicationBaseDirectory;
-        properties[TestContext.ResultsDirectoryLabel] = RunDirectories?.InDirectory ?? applicationBaseDirectory;
-        properties[TestContext.TestRunResultsDirectoryLabel] = RunDirectories?.InMachineNameDirectory ?? applicationBaseDirectory;
-        properties[TestContext.TestResultsDirectoryLabel] = RunDirectories?.InDirectory ?? applicationBaseDirectory;
+        properties[TestContextConstants.TestRunDirectoryLabel] = RunDirectories?.RootDeploymentDirectory ?? applicationBaseDirectory;
+        properties[TestContextConstants.DeploymentDirectoryLabel] = RunDirectories?.OutDirectory ?? applicationBaseDirectory;
+        properties[TestContextConstants.ResultsDirectoryLabel] = RunDirectories?.InDirectory ?? applicationBaseDirectory;
+        properties[TestContextConstants.TestRunResultsDirectoryLabel] = RunDirectories?.InMachineNameDirectory ?? applicationBaseDirectory;
+        properties[TestContextConstants.TestResultsDirectoryLabel] = RunDirectories?.InDirectory ?? applicationBaseDirectory;
 #pragma warning disable CS0618 // Type or member is obsolete
-        properties[TestContext.TestDirLabel] = RunDirectories?.RootDeploymentDirectory ?? applicationBaseDirectory;
-        properties[TestContext.TestDeploymentDirLabel] = RunDirectories?.OutDirectory ?? applicationBaseDirectory;
-        properties[TestContext.TestLogsDirLabel] = RunDirectories?.InMachineNameDirectory ?? applicationBaseDirectory;
+        properties[TestContextConstants.TestDirLabel] = RunDirectories?.RootDeploymentDirectory ?? applicationBaseDirectory;
+        properties[TestContextConstants.TestDeploymentDirLabel] = RunDirectories?.OutDirectory ?? applicationBaseDirectory;
+        properties[TestContextConstants.TestLogsDirLabel] = RunDirectories?.InMachineNameDirectory ?? applicationBaseDirectory;
 #pragma warning restore CS0618 // Type or member is obsolete
 
         return properties;

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

@@ -1,7 +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 !WINDOWS_UWP
+#if !WINDOWS_UWP && !WIN_UI
 
 using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;

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

@@ -1,7 +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 !WINDOWS_UWP
+#if !WINDOWS_UWP && !WIN_UI
 
 #if NETFRAMEWORK
 using System.Security;

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

@@ -1,7 +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 !WINDOWS_UWP
+#if !WINDOWS_UWP && !WIN_UI
 
 using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Deployment;
 using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Extensions;

src/TestFramework/TestFramework.Extensions/Friends.cs

@@ -2,9 +2,4 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 // Friend assemblies
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("MSTestAdapter.PlatformServices.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-
-#if WINDOWS_UWP || WIN_UI
-[assembly: InternalsVisibleTo("Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-#endif