4 files changed, 19 insertions, 17 deletions

diff --git a/src/tools/test/WixToolsetTest.Heat/DirectoryToPayloadGroupFixture.cs b/src/tools/test/WixToolsetTest.Heat/DirectoryToPayloadGroupFixture.cs
index 9ca84936..db71c4cd 100644
--- a/src/tools/test/WixToolsetTest.Heat/DirectoryToPayloadGroupFixture.cs
+++ b/src/tools/test/WixToolsetTest.Heat/DirectoryToPayloadGroupFixture.cs
@@ -5,12 +5,13 @@ namespace WixToolsetTest.Heat
     using System;
     using System.IO;
     using System.Linq;
-    using WixInternal.TestSupport;
-    using Xunit;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using WixInternal.MSTestSupport;
 
+    [TestClass]
     public class DirectoryToPayloadGroupFixture
     {
-        [Fact]
+        [TestMethod]
         public void CanHarvestSimpleDirectory()
         {
             var folder = TestData.Get("TestData", "SingleFile");
@@ -43,7 +44,7 @@ namespace WixToolsetTest.Heat
             }
         }
 
-        [Fact]
+        [TestMethod]
         public void CanHarvestSimpleDirectoryWithSourceDirSubstitution()
         {
             var folder = TestData.Get("TestData", "SingleFile");
@@ -77,7 +78,7 @@ namespace WixToolsetTest.Heat
             }
         }
 
-        [Fact]
+        [TestMethod]
         public void CanHarvestNestedFiles()
         {
             var folder = TestData.Get("TestData", "NestedFiles");
diff --git a/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs b/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs
index d517e209..c5f3df74 100644
--- a/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs
+++ b/src/tools/test/WixToolsetTest.Heat/HeatFixture.cs
@@ -4,12 +4,13 @@ namespace WixToolsetTest.Heat
 {
     using System.IO;
     using System.Linq;
-    using WixInternal.TestSupport;
-    using Xunit;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using WixInternal.MSTestSupport;
 
+    [TestClass]
     public class HeatFixture
     {
-        [Fact]
+        [TestMethod]
         public void CanHarvestSimpleDirectory()
         {
             var folder = TestData.Get("TestData", "SingleFile");
@@ -48,7 +49,7 @@ namespace WixToolsetTest.Heat
             }
         }
 
-        [Fact]
+        [TestMethod]
         public void CanHarvestSimpleDirectoryToComponentGroup()
         {
             var folder = TestData.Get("TestData", "SingleFile");
@@ -88,7 +89,7 @@ namespace WixToolsetTest.Heat
             }
         }
 
-        [Fact]
+        [TestMethod]
         public void CanHarvestSimpleDirectoryToInstallFolder()
         {
             var folder = TestData.Get("TestData", "SingleFile");
@@ -129,7 +130,7 @@ namespace WixToolsetTest.Heat
             }
         }
 
-        [Fact]
+        [TestMethod]
         public void CanHarvestFile()
         {
             var folder = TestData.Get("TestData", "SingleFile");
@@ -171,7 +172,7 @@ namespace WixToolsetTest.Heat
             }
         }
 
-        [Fact]
+        [TestMethod]
         public void CanHarvestRegistry()
         {
             var folder = TestData.Get("TestData", "RegFile");
@@ -195,7 +196,7 @@ namespace WixToolsetTest.Heat
             }
         }
 
-        [Fact]
+        [TestMethod]
         public void CanHarvestRegistryIntoComponentGroup()
         {
             var folder = TestData.Get("TestData", "RegFile");
diff --git a/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs b/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs
index 0f6c4f66..d8dec06f 100644
--- a/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs
+++ b/src/tools/test/WixToolsetTest.Heat/HeatRunner.cs
@@ -5,7 +5,7 @@ namespace WixToolsetTest.Heat
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using WixToolset.Core;
-    using WixInternal.Core.TestPackage;
+    using WixInternal.Core.MSTestPackage;
     using WixToolset.Data;
     using WixToolset.Extensibility.Services;
     using WixToolset.Tools.Heat;
diff --git a/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj b/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
index fb86ecdf..660dca3b 100644
--- a/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
+++ b/src/tools/test/WixToolsetTest.Heat/WixToolsetTest.Heat.csproj
@@ -1,11 +1,11 @@
 <?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>net472</TargetFramework>
     <DefaultItemExcludes>TestData\**;$(DefaultItemExcludes)</DefaultItemExcludes>
-    <IsWixTestProject>true</IsWixTestProject>
+    <IsWixMSTestProject>true</IsWixMSTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,6 +17,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixInternal.Core.TestPackage" />
+    <PackageReference Include="WixInternal.Core.MSTestPackage" />
   </ItemGroup>
 </Project>