From 7b519c8e428c8dbc059b0854bc01632ad5c950e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaury=20Lev=C3=A9?= <amauryleve@microsoft.com>
Date: Fri, 20 Dec 2024 14:01:29 +0100
Subject: [PATCH] Simplify adapter props and targets (#4397)

---
 eng/verify-nupkgs.ps1                         |  2 +-
 .../MSTest.TestAdapter.NonWindows.nuspec      | 18 ++--
 .../MSTest.TestAdapter.csproj                 |  2 +-
 .../MSTest.TestAdapter.nuspec                 | 22 ++---
 .../MSTest.TestAdapter.targets                |  0
 .../MSTest.TestAdapter.targets                | 88 -------------------
 .../build/uwp/MSTest.TestAdapter.props        | 29 +-----
 .../build/uwp/MSTest.TestAdapter.targets      | 34 +++++--
 8 files changed, 44 insertions(+), 151 deletions(-)
 rename src/Adapter/MSTest.TestAdapter/build/{net => common}/MSTest.TestAdapter.targets (100%)
 delete mode 100644 src/Adapter/MSTest.TestAdapter/build/netfx-netcore-netstandard/MSTest.TestAdapter.targets

diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1
index f13aa658aa..bef6bb99db 100644
--- a/eng/verify-nupkgs.ps1
+++ b/eng/verify-nupkgs.ps1
@@ -22,7 +22,7 @@ function Confirm-NugetPackages {
         "MSTest.Sdk"                            = 15;
         "MSTest.Internal.TestFx.Documentation"  = 10;
         "MSTest.TestFramework"                  = 148;
-        "MSTest.TestAdapter"                    = 82;
+        "MSTest.TestAdapter"                    = 74;
         "MSTest"                                = 6;
         "MSTest.Analyzers"                      = 10;
     }
diff --git a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.NonWindows.nuspec b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.NonWindows.nuspec
index 9e6505d523..62d93b1975 100644
--- a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.NonWindows.nuspec
+++ b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.NonWindows.nuspec
@@ -36,48 +36,42 @@
 
     <!-- netstandard2.0 -->
     <file src="netstandard2.0\build\common\MSTest.TestAdapter.props" target="build\netstandard2.0\" />
-    <file src="netstandard2.0\build\netfx-netcore-netstandard\MSTest.TestAdapter.targets" target="build\netstandard2.0\" />
-    <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\netstandard2.0\" />
+    <file src="netstandard2.0\build\common\MSTest.TestAdapter.targets" target="build\netstandard2.0\" />
     <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netstandard2.0\" />
     <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\netstandard2.0\" />
     <file src="netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\netstandard2.0\" />
 
     <!-- netcoreapp3.1 -->
     <file src="netcoreapp3.1\build\common\MSTest.TestAdapter.props" target="build\netcoreapp3.1\" />
-    <file src="netcoreapp3.1\build\netfx-netcore-netstandard\MSTest.TestAdapter.targets" target="build\netcoreapp3.1\" />
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\netcoreapp3.1\" />
+    <file src="netcoreapp3.1\build\common\MSTest.TestAdapter.targets" target="build\netcoreapp3.1\" />
     <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netcoreapp3.1\" />
     <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\netcoreapp3.1\" />
     <file src="netcoreapp3.1\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\netcoreapp3.1\" />
 
     <!-- net6.0 -->
     <file src="net6.0\build\common\MSTest.TestAdapter.props" target="build\net6.0\MSTest.TestAdapter.props" />
-    <file src="net6.0\build\net\MSTest.TestAdapter.targets" target="build\net6.0\MSTest.TestAdapter.targets" />
-    <file src="net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net6.0\" />
+    <file src="net6.0\build\common\MSTest.TestAdapter.targets" target="build\net6.0\MSTest.TestAdapter.targets" />
     <file src="net6.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net6.0\" />
     <file src="net6.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net6.0\" />
     <file src="net6.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net6.0\" />
 
     <!-- net7.0 -->
     <file src="net7.0\build\common\MSTest.TestAdapter.props" target="build\net7.0\MSTest.TestAdapter.props" />
-    <file src="net7.0\build\net\MSTest.TestAdapter.targets" target="build\net7.0\MSTest.TestAdapter.targets" />
-    <file src="net7.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net7.0\" />
+    <file src="net7.0\build\common\MSTest.TestAdapter.targets" target="build\net7.0\MSTest.TestAdapter.targets" />
     <file src="net7.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net7.0\" />
     <file src="net7.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net7.0\" />
     <file src="net7.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net7.0\" />
 
     <!-- net8.0 -->
     <file src="net8.0\build\common\MSTest.TestAdapter.props" target="build\net8.0\MSTest.TestAdapter.props" />
-    <file src="net8.0\build\net\MSTest.TestAdapter.targets" target="build\net8.0\MSTest.TestAdapter.targets" />
-    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net8.0\" />
+    <file src="net8.0\build\common\MSTest.TestAdapter.targets" target="build\net8.0\MSTest.TestAdapter.targets" />
     <file src="net8.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net8.0\" />
     <file src="net8.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net8.0\" />
     <file src="net8.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net8.0\" />
 
     <!-- net9.0 -->
     <file src="net9.0\build\common\MSTest.TestAdapter.props" target="build\net9.0\MSTest.TestAdapter.props" />
-    <file src="net9.0\build\net\MSTest.TestAdapter.targets" target="build\net9.0\MSTest.TestAdapter.targets" />
-    <file src="net9.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net9.0\" />
+    <file src="net9.0\build\common\MSTest.TestAdapter.targets" target="build\net9.0\MSTest.TestAdapter.targets" />
     <file src="net9.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net9.0\" />
     <file src="net9.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net9.0\" />
     <file src="net9.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net9.0\" />
diff --git a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj
index ec2308022d..3c92cb4996 100644
--- a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj
+++ b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.csproj
@@ -101,7 +101,7 @@
     <None Update="build\uwp\MSTest.TestAdapter.targets" Condition=" '$(TargetFramework)' == '$(UwpMinimum)' ">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="build\net\MSTest.TestAdapter.targets">
+    <None Update="build\common\MSTest.TestAdapter.targets">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="PACKAGE.md">
diff --git a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.nuspec b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.nuspec
index fab41babbc..845b2f2dee 100644
--- a/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.nuspec
+++ b/src/Adapter/MSTest.TestAdapter/MSTest.TestAdapter.nuspec
@@ -44,8 +44,7 @@
 
     <!-- netstandard2.0 -->
     <file src="netstandard2.0\build\common\MSTest.TestAdapter.props" target="build\netstandard2.0\" />
-    <file src="netstandard2.0\build\netfx-netcore-netstandard\MSTest.TestAdapter.targets" target="build\netstandard2.0\" />
-    <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\netstandard2.0\" />
+    <file src="netstandard2.0\build\common\MSTest.TestAdapter.targets" target="build\netstandard2.0\" />
     <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netstandard2.0\" />
     <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\netstandard2.0\" />
     <file src="netstandard2.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\netstandard2.0\" />
@@ -53,23 +52,20 @@
     <!-- uap10.0 -->
     <file src="uap10.0.16299\build\uwp\MSTest.TestAdapter.props" target="build\uap10.0\MSTest.TestAdapter.props" />
     <file src="uap10.0.16299\build\uwp\MSTest.TestAdapter.targets" target="build\uap10.0\MSTest.TestAdapter.targets" />
-    <file src="uap10.0.16299\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\uap10.0\" />
     <file src="$ArtifactsBinDir$MSTestAdapter.PlatformServices\$Configuration$\uap10.0.16299\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\uap10.0\" />
     <file src="uap10.0.16299\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\uap10.0\" />
     <file src="uap10.0.16299\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\uap10.0\" />
 
     <!-- netcoreapp3.1 -->
     <file src="netcoreapp3.1\build\common\MSTest.TestAdapter.props" target="build\netcoreapp3.1\" />
-    <file src="netcoreapp3.1\build\netfx-netcore-netstandard\MSTest.TestAdapter.targets" target="build\netcoreapp3.1\" />
-    <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\netcoreapp3.1\" />
+    <file src="netcoreapp3.1\build\common\MSTest.TestAdapter.targets" target="build\netcoreapp3.1\" />
     <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\netcoreapp3.1\" />
     <file src="netcoreapp3.1\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\netcoreapp3.1\" />
     <file src="netcoreapp3.1\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\netcoreapp3.1\" />
 
     <!-- net6.0 -->
     <file src="net6.0\build\common\MSTest.TestAdapter.props" target="build\net6.0\MSTest.TestAdapter.props" />
-    <file src="net6.0\build\net\MSTest.TestAdapter.targets" target="build\net6.0\MSTest.TestAdapter.targets" />
-    <file src="net6.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net6.0\" />
+    <file src="net6.0\build\common\MSTest.TestAdapter.targets" target="build\net6.0\MSTest.TestAdapter.targets" />
     <file src="net6.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net6.0\" />
     <file src="$ArtifactsBinDir$MSTestAdapter.PlatformServices\$Configuration$\net6.0-windows10.0.18362.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net6.0\winui\" />
     <file src="net6.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net6.0\" />
@@ -78,32 +74,28 @@
 
     <!-- net7.0 -->
     <file src="net7.0\build\common\MSTest.TestAdapter.props" target="build\net7.0\MSTest.TestAdapter.props" />
-    <file src="net7.0\build\net\MSTest.TestAdapter.targets" target="build\net7.0\MSTest.TestAdapter.targets" />
-    <file src="net7.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net7.0\" />
+    <file src="net7.0\build\common\MSTest.TestAdapter.targets" target="build\net7.0\MSTest.TestAdapter.targets" />
     <file src="net7.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net7.0\" />
     <file src="net7.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net7.0\" />
     <file src="net7.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net7.0\" />
 
     <!-- net8.0 -->
     <file src="net8.0\build\common\MSTest.TestAdapter.props" target="build\net8.0\MSTest.TestAdapter.props" />
-    <file src="net8.0\build\net\MSTest.TestAdapter.targets" target="build\net8.0\MSTest.TestAdapter.targets" />
-    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net8.0\" />
+    <file src="net8.0\build\common\MSTest.TestAdapter.targets" target="build\net8.0\MSTest.TestAdapter.targets" />
     <file src="net8.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net8.0\" />
     <file src="net8.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net8.0\" />
     <file src="net8.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net8.0\" />
 
     <!-- net9.0 -->
     <file src="net9.0\build\common\MSTest.TestAdapter.props" target="build\net9.0\MSTest.TestAdapter.props" />
-    <file src="net9.0\build\net\MSTest.TestAdapter.targets" target="build\net9.0\MSTest.TestAdapter.targets" />
-    <file src="net9.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net9.0\" />
+    <file src="net9.0\build\common\MSTest.TestAdapter.targets" target="build\net9.0\MSTest.TestAdapter.targets" />
     <file src="net9.0\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net9.0\" />
     <file src="net9.0\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net9.0\" />
     <file src="net9.0\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net9.0\" />
 
     <!-- net462 -->
     <file src="net462\build\common\MSTest.TestAdapter.props" target="build\net462\" />
-    <file src="net462\build\netfx-netcore-netstandard\MSTest.TestAdapter.targets" target="build\net462\" />
-    <file src="net462\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="build\net462\" />
+    <file src="net462\build\common\MSTest.TestAdapter.targets" target="build\net462\" />
     <file src="net462\Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll" target="build\net462\" />
     <file src="net462\Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" target="build\net462\" />
     <file src="net462\Microsoft.TestPlatform.AdapterUtilities.dll" target="build\net462\" />
diff --git a/src/Adapter/MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets b/src/Adapter/MSTest.TestAdapter/build/common/MSTest.TestAdapter.targets
similarity index 100%
rename from src/Adapter/MSTest.TestAdapter/build/net/MSTest.TestAdapter.targets
rename to src/Adapter/MSTest.TestAdapter/build/common/MSTest.TestAdapter.targets
diff --git a/src/Adapter/MSTest.TestAdapter/build/netfx-netcore-netstandard/MSTest.TestAdapter.targets b/src/Adapter/MSTest.TestAdapter/build/netfx-netcore-netstandard/MSTest.TestAdapter.targets
deleted file mode 100644
index 64fb79bf30..0000000000
--- a/src/Adapter/MSTest.TestAdapter/build/netfx-netcore-netstandard/MSTest.TestAdapter.targets
+++ /dev/null
@@ -1,88 +0,0 @@
-<Project>
-
-  <!-- Handle the coexistence between testing platform and Microsoft.NET.Test.Sdk  -->
-  <PropertyGroup>
-    <GenerateTestingPlatformEntryPoint Condition=" '$(GenerateTestingPlatformEntryPoint)' == '' ">$(EnableMSTestRunner)</GenerateTestingPlatformEntryPoint>
-    <GenerateSelfRegisteredExtensions Condition=" '$(GenerateSelfRegisteredExtensions)' == '' ">$(EnableMSTestRunner)</GenerateSelfRegisteredExtensions>
-    <GenerateProgramFile Condition=" '$(EnableMSTestRunner)' == 'true' ">false</GenerateProgramFile>
-    <DisableTestingPlatformServerCapability Condition=" '$(EnableMSTestRunner)' == 'false' or '$(EnableMSTestRunner)' == '' " >true</DisableTestingPlatformServerCapability>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <TestAdapterContent Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" Condition=" '$(EnableMSTestRunner)' != 'true' ">
-      <Link>Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </TestAdapterContent>
-    <TestAdapterContent Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll">
-      <Link>Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </TestAdapterContent>
-    <TestAdapterContent Include="$(MSBuildThisFileDirectory)\Microsoft.TestPlatform.AdapterUtilities.dll">
-      <Link>Microsoft.TestPlatform.AdapterUtilities.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </TestAdapterContent>
-  </ItemGroup>
-
-  <ItemGroup>
-    <!--
-      Including `@(TestAdapterContent)` in the `None` ItemGroup to get the `CopyToOutputDirectory` behavior be default,
-      package consumers can opt-out of this behavior by removing `@(TestAdapterContent)` from the `None` ItemGroup
-      (i.e. `<None Remove="@(TestAdapterContent)" />`)
-      -->
-    <None Include="@(TestAdapterContent)" />
-  </ItemGroup>
-
-  <Choose>
-    <!-- Avoid false warning about missing reference (msbuild bug) -->
-    <!-- https://github.com/dotnet/msbuild/issues/9698#issuecomment-1945763467 -->
-    <When Condition=" '$(EnableMSTestRunner)' == 'true' ">
-      <ItemGroup>
-        <Reference Include="Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter">
-          <HintPath>$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll</HintPath>
-        </Reference>
-      </ItemGroup>
-    </When>
-  </Choose>
-
-  <Target Name="GetMSTestV2CultureHierarchy">
-    <!--
-      Only traversing 5 levels in the culture hierarchy. This is the maximum length for all cultures and should be sufficient
-      to get to a culture name that maps to a resource folder we package.
-      The root culture name for all cultures is invariant whose name is '' (empty) and the parent for invariant culture is
-      invariant itself. (https://msdn.microsoft.com/library/system.globalization.cultureinfo.parent.aspx)
-      So the below code should not break build in any case.
-      -->
-    <ItemGroup>
-      <CurrentUICultureHierarchy Include="$([System.Globalization.CultureInfo]::CurrentUICulture.Name)" />
-      <CurrentUICultureHierarchy Include="$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Name)"  Condition=" '$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Name)' != '' "/>
-      <CurrentUICultureHierarchy Include="$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Parent.Name)"  Condition=" '$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Parent.Name)' != '' "/>
-      <CurrentUICultureHierarchy Include="$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Parent.Parent.Name)"  Condition=" '$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Parent.Parent.Name)' != '' "/>
-      <CurrentUICultureHierarchy Include="$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Parent.Parent.Parent.Name)"  Condition=" '$([System.Globalization.CultureInfo]::CurrentUICulture.Parent.Parent.Parent.Parent.Name)' != '' "/>
-    </ItemGroup>
-  </Target>
-
-  <!-- Copy resources over to $(TargetDir) if this is a localized build. -->
-  <Target Name="CopyMSTestV2Resources" BeforeTargets="PrepareForBuild" Condition=" '$(EnableMSTestV2CopyResources)' == 'true' " DependsOnTargets="GetMSTestV2CultureHierarchy">
-
-    <!-- Expand the UICulture hierarchy to items, such as cs-CZ, cs, and attach the culture metadata to the item. -->
-    <ItemGroup>
-      <MSTestV2Files Include="$(MSBuildThisFileDirectory)..\_localization\%(CurrentUICultureHierarchy.Identity)\*.dll">
-        <UICulture>%(CurrentUICultureHierarchy.Identity)</UICulture>
-      </MSTestV2Files>
-    </ItemGroup>
-
-    <ItemGroup>
-      <!-- Add the localization file as content so it gets copied from nuget to bin folder. -->
-      <Content Include="@(MSTestV2Files->'%(FullPath)')">
-        <Link>%(MSTestV2Files.UICulture)\%(FileName).dll</Link>
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        <BaseAssemblyFullPath>%(FullPath)</BaseAssemblyFullPath>
-        <Visible>False</Visible>
-      </Content>
-    </ItemGroup>
-  </Target>
-
-</Project>
diff --git a/src/Adapter/MSTest.TestAdapter/build/uwp/MSTest.TestAdapter.props b/src/Adapter/MSTest.TestAdapter/build/uwp/MSTest.TestAdapter.props
index 365706e987..259e47a969 100644
--- a/src/Adapter/MSTest.TestAdapter/build/uwp/MSTest.TestAdapter.props
+++ b/src/Adapter/MSTest.TestAdapter/build/uwp/MSTest.TestAdapter.props
@@ -1,30 +1,7 @@
 <Project>
 
-  <ItemGroup>
-    <TestAdapterContent Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll">
-      <Link>Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </TestAdapterContent>
-    <TestAdapterContent Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll">
-      <Link>Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </TestAdapterContent>
-    <TestAdapterContent Include="$(MSBuildThisFileDirectory)Microsoft.TestPlatform.AdapterUtilities.dll">
-      <Link>Microsoft.TestPlatform.AdapterUtilities.dll</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-    </TestAdapterContent>
-  </ItemGroup>
-
-  <ItemGroup>
-    <!--
-      Including `@(TestAdapterContent)` in the `None` ItemGroup to get the `CopyToOutputDirectory` behavior be default,
-      package consumers can opt-out of this behavior by removing `@(TestAdapterContent)` from the `None` ItemGroup
-      (i.e. `<None Remove="@(TestAdapterContent)" />`)
-      -->
-    <None Include="@(TestAdapterContent)" />
-  </ItemGroup>
+  <PropertyGroup>
+    <EnableMSTestV2CopyResources Condition=" '$(EnableMSTestV2CopyResources)' == '' ">true</EnableMSTestV2CopyResources>
+  </PropertyGroup>
 
 </Project>
diff --git a/src/Adapter/MSTest.TestAdapter/build/uwp/MSTest.TestAdapter.targets b/src/Adapter/MSTest.TestAdapter/build/uwp/MSTest.TestAdapter.targets
index c33b561416..7fac02bef5 100644
--- a/src/Adapter/MSTest.TestAdapter/build/uwp/MSTest.TestAdapter.targets
+++ b/src/Adapter/MSTest.TestAdapter/build/uwp/MSTest.TestAdapter.targets
@@ -1,13 +1,31 @@
 <Project>
 
-  <PropertyGroup>
-    <EnableMSTestV2CopyResources Condition=" '$(EnableMSTestV2CopyResources)' == '' ">true</EnableMSTestV2CopyResources>
-    <!-- Handle the coexistence between testing platform and Microsoft.NET.Test.Sdk  -->
-    <GenerateTestingPlatformEntryPoint Condition=" '$(GenerateTestingPlatformEntryPoint)' == '' ">$(EnableMSTestRunner)</GenerateTestingPlatformEntryPoint>
-    <GenerateSelfRegisteredExtensions Condition=" '$(GenerateSelfRegisteredExtensions)' == '' ">$(EnableMSTestRunner)</GenerateSelfRegisteredExtensions>
-    <GenerateProgramFile Condition=" '$(EnableMSTestRunner)' == 'true' ">false</GenerateProgramFile>
-    <DisableTestingPlatformServerCapability Condition=" '$(EnableMSTestRunner)' == 'false' or '$(EnableMSTestRunner)' == '' " >true</DisableTestingPlatformServerCapability>
-  </PropertyGroup>
+  <ItemGroup>
+    <TestAdapterContent Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" Condition=" '$(EnableMSTestRunner)' != 'true' ">
+      <Link>Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </TestAdapterContent>
+    <TestAdapterContent Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll">
+      <Link>Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </TestAdapterContent>
+    <TestAdapterContent Include="$(MSBuildThisFileDirectory)\Microsoft.TestPlatform.AdapterUtilities.dll">
+      <Link>Microsoft.TestPlatform.AdapterUtilities.dll</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+    </TestAdapterContent>
+  </ItemGroup>
+
+  <ItemGroup>
+    <!--
+      Including `@(TestAdapterContent)` in the `None` ItemGroup to get the `CopyToOutputDirectory` behavior be default,
+      package consumers can opt-out of this behavior by removing `@(TestAdapterContent)` from the `None` ItemGroup
+      (i.e. `<None Remove="@(TestAdapterContent)" />`)
+      -->
+    <None Include="@(TestAdapterContent)" />
+  </ItemGroup>
 
   <Target Name="GetMSTestV2CultureHierarchy">
     <!--