From ca6e44d496b0c589fdaabad69a00643f539c47cd Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Fri, 14 Feb 2025 22:29:39 -0500
Subject: Convert ext\ to MSTest and traversal projects.

- Move ext\ unit tests to MSTest.
- MSBuildify ext projects with MSTest execution.
- Fork test support projects for MSTest:
  - WixInternal.TestSupport
  - WixInternal.Core.TestPackage
---
 .../VisualStudioExtensionFixture.cs                           | 11 ++++++-----
 .../WixToolsetTest.VisualStudio.csproj                        |  7 ++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'src/ext/VisualStudio/test/WixToolsetTest.VisualStudio')

diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs
index f3e81e2d..992ac953 100644
--- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs
+++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs
@@ -2,15 +2,16 @@
 
 namespace WixToolsetTest.VisualStudio
 {
-    using WixInternal.TestSupport;
-    using WixInternal.Core.TestPackage;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using WixInternal.MSTestSupport;
+    using WixInternal.Core.MSTestPackage;
     using WixToolset.VisualStudio;
-    using Xunit;
     using System.Linq;
 
+    [TestClass]
     public class VisualStudioExtensionFixture
     {
-        [Fact]
+        [TestMethod]
         public void CanBuildUsingVsixPackage()
         {
             var folder = TestData.Get(@"TestData\UsingVsixPackage");
@@ -36,7 +37,7 @@ namespace WixToolsetTest.VisualStudio
             }, results);
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildUsingVsixPackageOnArm64()
         {
             var folder = TestData.Get(@"TestData\UsingVsixPackage");
diff --git a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
index 2b0a7c1c..9cfb6867 100644
--- a/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
+++ b/src/ext/VisualStudio/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.csproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSTest.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
-    <IsWixTestProject>true</IsWixTestProject>
+    <IsWixMSTestProject>true</IsWixMSTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,6 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixInternal.Core.TestPackage" />
+    <PackageReference Include="WixInternal.MSTestSupport" />
+    <PackageReference Include="WixInternal.Core.MSTestPackage" />
   </ItemGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb