From 431954a4fe379dd5dde3240988a62075fa79d772 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Mon, 16 Sep 2024 19:40:52 +0200
Subject: [PATCH] Remove 'net8.0-windows10.0.26100.0' TFM

---
 .../TestFramework.Extensions/MSTest.TestFramework.nuspec | 9 ++-------
 .../build/winui/MSTest.TestFramework.targets             | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec b/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec
index ffe21f0391..12fd581b76 100644
--- a/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec
+++ b/src/TestFramework/TestFramework.Extensions/MSTest.TestFramework.nuspec
@@ -69,13 +69,8 @@
     <file src="net8.0\**\Microsoft.VisualStudio.TestPlatform.TestFramework.resources.dll" target="lib\net8.0\" />
     <file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net8.0\" />
     <file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net8.0\" />
-
-    <!-- net8.0-windows10.0.26100.0 -->
-    <file src="net8.0\build\winui\MSTest.TestFramework.targets" target="build\net8.0-windows10.0.26100.0\" />
-    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.dll" target="lib\net8.0-windows10.0.26100.0\" />
-    <file src="net8.0\Microsoft.VisualStudio.TestPlatform.TestFramework.xml" target="lib\net8.0-windows10.0.26100.0\" />
-    <file src="net8.0-windows10.0.26100.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net8.0-windows10.0.26100.0\uwp\" />
-    <file src="net8.0-windows10.0.26100.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net8.0-windows10.0.26100.0\uwp\" />
+    <file src="net8.0-windows10.0.26100.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.dll" target="build\net8.0\uwp\" />
+    <file src="net8.0-windows10.0.26100.0\Microsoft.VisualStudio.TestPlatform.TestFramework.Extensions.xml" target="build\net8.0\uwp\" />
 
     <!-- Source code -->
     <file src="$srcroot$\**\*.cs" target="src" />
diff --git a/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets b/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets
index 1b7c592c71..5f2305106d 100644
--- a/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets
+++ b/src/TestFramework/TestFramework.Extensions/build/winui/MSTest.TestFramework.targets
@@ -4,7 +4,7 @@
     <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net6.0/winui/</_TestFrameworkExtensionsRoot>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(UseUwpTools)' == 'true' ">
-    <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net8.0-windows10.0.26100.0/uwp/</_TestFrameworkExtensionsRoot>
+    <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)../net8.0/uwp/</_TestFrameworkExtensionsRoot>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(UseWinUI)' != 'true' ">
     <_TestFrameworkExtensionsRoot>$(MSBuildThisFileDirectory)</_TestFrameworkExtensionsRoot>