microsoft · Evangelink · Oct 13, 2022 · Oct 7, 2022 · Oct 7, 2022 · Oct 7, 2022
diff --git a/TestFx.sln b/TestFx.sln
@@ -195,6 +195,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestFramework.ForTestingMST
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HierarchyProject", "test\E2ETests\TestAssets\HierarchyProject\HierarchyProject.csproj", "{94A4DAA8-9645-4161-91F6-11EB1AD70EFC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SuiteLifeCycleTestProject", "test\E2ETests\TestAssets\SuiteLifeCycleTestProject\SuiteLifeCycleTestProject.csproj", "{9B5D52F6-EC81-48FA-9F2F-4F5FA7FE70F1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -341,6 +343,10 @@ Global
 		{94A4DAA8-9645-4161-91F6-11EB1AD70EFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{94A4DAA8-9645-4161-91F6-11EB1AD70EFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{94A4DAA8-9645-4161-91F6-11EB1AD70EFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9B5D52F6-EC81-48FA-9F2F-4F5FA7FE70F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9B5D52F6-EC81-48FA-9F2F-4F5FA7FE70F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9B5D52F6-EC81-48FA-9F2F-4F5FA7FE70F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9B5D52F6-EC81-48FA-9F2F-4F5FA7FE70F1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -400,6 +406,7 @@ Global
 		{66608D86-416A-49AF-A937-C47F7E4586AE} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
 		{0685FBC3-C3A9-43A9-B15C-15BAA39705FE} = {33D3029D-E653-4929-BB31-C714178C4BEE}
 		{94A4DAA8-9645-4161-91F6-11EB1AD70EFC} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
+		{9B5D52F6-EC81-48FA-9F2F-4F5FA7FE70F1} = {D53BD452-F69F-4FB3-8B98-386EDA28A4C8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {31E0F4D5-975A-41CC-933E-545B2201FAF9}

diff --git a/test/E2ETests/Automation.CLI/Automation.CLI.csproj b/test/E2ETests/Automation.CLI/Automation.CLI.csproj
@@ -14,34 +14,5 @@
     <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" PrivateAssets="all" />
     <ProjectReference Include="$(RepoRoot)test\TestFramework.ForTestingMSTest\TestFramework.ForTestingMSTest.csproj" />
   </ItemGroup>
-
-  <Target Name="CopyMSBuildScriptsFiles" DependsOnTargets="CoreCompile" AfterTargets="CoreCompile">
-    <PropertyGroup>
-      <SourcePath>$(TargetDir)..\..\</SourcePath>
-      <DestinationPath>$(TargetDir)..\..\..\TestAssets</DestinationPath>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <FileToCopy Include="$(NuGetPackageRoot)\microsoft.testplatform.adapterutilities\$(MicrosoftNETTestSdkVersion)\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" KeepDuplicates="true" />
-      <FileToCopy Include="$(SourcePath)MSTestAdapter.PlatformServices\net462\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" KeepDuplicates="True" />
-      <FileToCopy Include="$(SourcePath)MSTestAdapter.PlatformServices\net462\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb" KeepDuplicates="True" />
-      <FileToCopy Include="$(SourcePath)TestFramework\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" KeepDuplicates="True" />
-      <FileToCopy Include="$(SourcePath)TestFramework\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.pdb" KeepDuplicates="True" />
-      <FileToCopy Include="$(SourcePath)TestFramework.Extensions\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" KeepDuplicates="True" />
-      <FileToCopy Include="$(SourcePath)TestFramework.Extensions\net462\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.pdb" KeepDuplicates="True" />
-      <FileToCopy Include="$(SourcePath)MSTest.TestAdapter\net462\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" KeepDuplicates="True" />
-      <FileToCopy Include="$(SourcePath)MSTest.TestAdapter\net462\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.pdb" KeepDuplicates="True" />
-
-      <FileToCopy Include="$(NuGetPackageRoot)\microsoft.testplatform.adapterutilities\$(MicrosoftNETTestSdkVersion)\lib\netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" KeepDuplicates="true" Folder="netcoreapp3.1" />
-      <FileToCopy Include="$(SourcePath)MSTest.TestAdapter\netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" KeepDuplicates="True" Folder="netcoreapp3.1" />
-      <FileToCopy Include="$(SourcePath)MSTest.TestAdapter\netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.pdb" KeepDuplicates="True" Folder="netcoreapp3.1" />
-      <FileToCopy Include="$(SourcePath)MSTestAdapter.PlatformServices\netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" KeepDuplicates="True" Folder="netcoreapp3.1" />
-      <FileToCopy Include="$(SourcePath)MSTestAdapter.PlatformServices\netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.pdb" KeepDuplicates="True" Folder="netcoreapp3.1" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(FileToCopy)" DestinationFiles="$(DestinationPath)\%(FileToCopy.Folder)\%(Filename)%(Extension)" SkipUnchangedFiles="True" OverwriteReadOnlyFiles="True" Retries="3" RetryDelayMilliseconds="500" UseHardlinksIfPossible="False" UseSymboliclinksIfPossible="False" ErrorIfLinkFails="False" Condition="@(FileToCopy-&gt;Count()) &gt; 0">
-
-      <Output TaskParameter="DestinationFiles" ItemName="FileWrites" />
-    </Copy>
-  </Target>
+
 </Project>
diff --git a/test/E2ETests/Automation.CLI/CLITestBase.common.cs b/test/E2ETests/Automation.CLI/CLITestBase.common.cs
@@ -79,7 +79,7 @@ protected string GetTestAdapterPath()
     /// <param name="settingsXml">RunSettings provided for discovery/execution</param>
     /// <param name="testAdapterPath">Full path to TestAdapter.</param>
     /// <returns>RunSettingXml as string</returns>
-    protected string GetRunSettingXml(string settingsXml, string testAdapterPath)
+    protected string GetRunSettingXml(string settingsXml, string testAdapterPath, string targetFramework = "")
     {
         if (string.IsNullOrEmpty(settingsXml))
         {
@@ -93,7 +93,7 @@ protected string GetRunSettingXml(string settingsXml, string testAdapterPath)
         }
 
         XmlElement root = doc.DocumentElement;
-        RunConfiguration runConfiguration = new(testAdapterPath);
+        RunConfiguration runConfiguration = new(Path.Combine(testAdapterPath, targetFramework));
         XmlElement runConfigElement = runConfiguration.ToXml();
         if (root[runConfiguration.SettingsName] == null)
         {

diff --git a/test/E2ETests/Automation.CLI/CLITestBase.e2e.cs b/test/E2ETests/Automation.CLI/CLITestBase.e2e.cs
@@ -18,7 +18,7 @@ public partial class CLITestBase : TestContainer
 {
     private static VsTestConsoleWrapper s_vsTestConsoleWrapper;
     private DiscoveryEventsHandler _discoveryEventsHandler;
-    private RunEventsHandler _runEventsHandler;
+    protected RunEventsHandler _runEventsHandler;
 
     public CLITestBase()
     {
@@ -47,12 +47,12 @@ public void InvokeVsTestForDiscovery(string[] sources, string runSettings = "")
     /// <param name="sources">List of test assemblies.</param>
     /// <param name="runSettings">Run settings for execution.</param>
     /// <param name="testCaseFilter">Test Case filter for execution.</param>
-    public void InvokeVsTestForExecution(string[] sources, string runSettings = "", string testCaseFilter = null)
+    public void InvokeVsTestForExecution(string[] sources, string runSettings = "", string testCaseFilter = null, string targetFramework = "")
     {
         ExpandTestSourcePaths(sources);
 
         _runEventsHandler = new RunEventsHandler();
-        string runSettingXml = GetRunSettingXml(runSettings, GetTestAdapterPath());
+        string runSettingXml = GetRunSettingXml(runSettings, GetTestAdapterPath(), targetFramework);
 
         s_vsTestConsoleWrapper.RunTests(sources, runSettingXml, new TestPlatformOptions { TestCaseFilter = testCaseFilter }, _runEventsHandler);
         if (_runEventsHandler.Errors.Any())

diff --git a/test/E2ETests/Smoke.E2E.Tests/SuiteLifeCycleTests.cs b/test/E2ETests/Smoke.E2E.Tests/SuiteLifeCycleTests.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Linq;
+
+using Microsoft.MSTestV2.CLIAutomation;
+
+namespace MSTestAdapter.Smoke.E2ETests;
+public class SuiteLifeCycleTests : CLITestBase
+{
+    private const string Assembly = "SuiteLifeCycleTestProject.dll";
+
+    public void ValidateTestRunLifecycle_net6()
+    {
+        ValidateTestRunLifecycle("net6.0");
+    }
+
+    public void ValidateTestRunLifecycle_net462()
+    {
+        ValidateTestRunLifecycle("net462");
+    }
+
+    private void ValidateTestRunLifecycle(string targetFramework)
+    {
+        InvokeVsTestForExecution(new[] { targetFramework + "\\" + Assembly }, targetFramework: targetFramework);
+        Verify(_runEventsHandler.PassedTests.Count == 1);
+
+        var testMethod = _runEventsHandler.PassedTests.Single();
+        Verify(testMethod.Outcome == Microsoft.VisualStudio.TestPlatform.ObjectModel.TestOutcome.Passed);
+        if (targetFramework == "net462")
+        {
+            Verify(testMethod.Messages.Single().Text.Contains(
+                """
+                ClassInitialize was called
+                Ctor was called
+                TestInitialize was called
+                TestMethod was called
+                TestCleanup was called
+                Dispose was called
+                ClassCleanup was called
+                """));
+        }
+        else
+        {
+            Verify(testMethod.Messages.Single().Text.Contains(
+                """
+                ClassInitialize was called
+                Ctor was called
+                TestInitialize was called
+                TestMethod was called
+                TestCleanup was called
+                DisposeAsync was called
+                Dispose was called
+                ClassCleanup was called
+                """));
+        }
+    }
+}
diff --git a/test/E2ETests/TestAssets/DataRowTestProject/DataRowTestProject.csproj b/test/E2ETests/TestAssets/DataRowTestProject/DataRowTestProject.csproj
@@ -7,8 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj b/test/E2ETests/TestAssets/DataSourceTestProject/DataSourceTestProject.csproj
@@ -7,8 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
     <ProjectReference Include="..\ReferencedProjectFromDataSourceTest\ReferencedProjectFromDataSourceTest.csproj" />
   </ItemGroup>
 

diff --git a/test/E2ETests/TestAssets/DeploymentTestProject/DeploymentTestProject.csproj b/test/E2ETests/TestAssets/DeploymentTestProject/DeploymentTestProject.csproj
@@ -11,8 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj b/test/E2ETests/TestAssets/DeploymentTestProjectNetCore/DeploymentTestProjectNetCore.csproj
@@ -8,8 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/E2ETests/TestAssets/DesktopTestProjectx64Debug/DesktopTestProjectx64Debug.csproj b/test/E2ETests/TestAssets/DesktopTestProjectx64Debug/DesktopTestProjectx64Debug.csproj
@@ -8,12 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/E2ETests/TestAssets/DesktopTestProjectx64Release/DesktopTestProjectx64Release.csproj b/test/E2ETests/TestAssets/DesktopTestProjectx64Release/DesktopTestProjectx64Release.csproj
@@ -8,12 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/E2ETests/TestAssets/DesktopTestProjectx86Debug/DesktopTestProjectx86Debug.csproj b/test/E2ETests/TestAssets/DesktopTestProjectx86Debug/DesktopTestProjectx86Debug.csproj
@@ -7,12 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/test/E2ETests/TestAssets/DesktopTestProjectx86Release/DesktopTestProjectx86Release.csproj b/test/E2ETests/TestAssets/DesktopTestProjectx86Release/DesktopTestProjectx86Release.csproj
@@ -8,12 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/E2ETests/TestAssets/DiscoverInternalsProject/DiscoverInternalsProject.csproj b/test/E2ETests/TestAssets/DiscoverInternalsProject/DiscoverInternalsProject.csproj
@@ -7,8 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/E2ETests/TestAssets/DoNotParallelizeTestProject/DoNotParallelizeTestProject.csproj b/test/E2ETests/TestAssets/DoNotParallelizeTestProject/DoNotParallelizeTestProject.csproj
@@ -7,8 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/E2ETests/TestAssets/FSharpTestProject/FSharpTestProject.fsproj b/test/E2ETests/TestAssets/FSharpTestProject/FSharpTestProject.fsproj
@@ -9,8 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" />
+      <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/E2ETests/TestAssets/FxExtensibilityTestProject/FxExtensibilityTestProject.csproj b/test/E2ETests/TestAssets/FxExtensibilityTestProject/FxExtensibilityTestProject.csproj
@@ -8,9 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="System" />
     <ProjectReference Include="$(RepoRoot)samples\FxExtensibility\FxExtensibility.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/test/E2ETests/TestAssets/HierarchyProject/HierarchyProject.csproj b/test/E2ETests/TestAssets/HierarchyProject/HierarchyProject.csproj
@@ -8,8 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)\src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
-    <ProjectReference Include="$(RepoRoot)\src\TestFramework\TestFramework\TestFramework.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/test/E2ETests/TestAssets/OutputTestProject/OutputTestProject.csproj b/test/E2ETests/TestAssets/OutputTestProject/OutputTestProject.csproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)\src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
-    <ProjectReference Include="$(RepoRoot)\src\TestFramework\TestFramework\TestFramework.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 </Project>
diff --git a/test/E2ETests/TestAssets/ParallelTestClass/ParallelClassesTestProject.csproj b/test/E2ETests/TestAssets/ParallelTestClass/ParallelClassesTestProject.csproj
@@ -8,12 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/test/E2ETests/TestAssets/ParallelTestMethods/ParallelMethodsTestProject.csproj b/test/E2ETests/TestAssets/ParallelTestMethods/ParallelMethodsTestProject.csproj
@@ -8,12 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
-    <ProjectReference Include="$(RepoRoot)src\TestFramework\TestFramework\TestFramework.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
 </Project>