4 files changed, 52 insertions, 78 deletions

diff --git a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
index 13c39091..03d87e4e 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+++ b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
@@ -2,19 +2,20 @@
 
 namespace WixToolsetTest.Util
 {
+    using System;
     using System.IO;
     using System.Linq;
     using System.Xml;
-    using WixInternal.TestSupport;
-    using WixInternal.Core.TestPackage;
-    using WixToolset.Util;
-    using Xunit;
     using System.Xml.Linq;
-    using System;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using WixInternal.MSTestSupport;
+    using WixInternal.Core.MSTestPackage;
+    using WixToolset.Util;
 
+    [TestClass]
     public class UtilExtensionFixture
     {
-        [Fact]
+        [TestMethod]
         public void CanBuildUsingFileShare()
         {
             var folder = TestData.Get(@"TestData\UsingFileShare");
@@ -35,7 +36,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildUsingFileShareX64()
         {
             var folder = TestData.Get(@"TestData\UsingFileShare");
@@ -56,7 +57,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanRoundtripFileShare()
         {
             var folder = TestData.Get(@"TestData", "UsingFileShare");
@@ -79,7 +80,7 @@ namespace WixToolsetTest.Util
             }, utilElementNames);
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildCloseApplication()
         {
             var folder = TestData.Get(@"TestData\CloseApplication");
@@ -96,7 +97,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildInternetShortcutInProduct()
         {
             var folder = TestData.Get(@"TestData\InternetShortcut");
@@ -116,7 +117,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildInternetShortcutInMergeModule()
         {
             var folder = TestData.Get(@"TestData\InternetShortcutModule");
@@ -136,7 +137,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildWithPermissionEx()
         {
             var folder = TestData.Get(@"TestData\PermissionEx");
@@ -153,7 +154,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildRemoveRegistryKeyExInMergeModule()
         {
             var folder = TestData.Get(@"TestData", "RemoveRegistryKeyEx");
@@ -168,7 +169,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildRemoveFolderExInMergeModule()
         {
             var folder = TestData.Get(@"TestData\RemoveFolderEx");
@@ -183,7 +184,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildRemoveFolderExInPackage()
         {
             var folder = TestData.Get(@"TestData\RemoveFolderExPackage");
@@ -198,7 +199,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildServiceConfig()
         {
             var folder = TestData.Get(@"TestData", "ServiceConfig");
@@ -215,7 +216,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildWithEventManifest()
         {
             var folder = TestData.Get(@"TestData\EventManifest");
@@ -240,7 +241,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildWithQueries()
         {
             var folder = TestData.Get(@"TestData\Queries");
@@ -259,7 +260,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildAndDecompiileQueries()
         {
             var folder = TestData.Get(@"TestData\Queries");
@@ -285,7 +286,7 @@ namespace WixToolsetTest.Util
             }, utilElementNames);
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildWithXmlConfig()
         {
             var folder = TestData.Get(@"TestData", "XmlConfig");
@@ -301,7 +302,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanRoundtripXmlConfig()
         {
             var folder = TestData.Get(@"TestData", "XmlConfig");
@@ -324,7 +325,7 @@ namespace WixToolsetTest.Util
             }, utilElementNames);
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildModuleWithXmlConfig()
         {
             var folder = TestData.Get(@"TestData", "XmlConfigModule");
@@ -338,7 +339,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildBundleWithSearches()
         {
             var folder = TestData.Get(@"TestData\BundleWithSearches");
@@ -366,15 +367,15 @@ namespace WixToolsetTest.Util
 
                 result.AssertSuccess();
 
-                Assert.True(File.Exists(bundlePath));
-                Assert.True(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
+                Assert.IsTrue(File.Exists(bundlePath));
+                Assert.IsTrue(File.Exists(Path.Combine(baseFolder, @"bin\test.wixpdb")));
 
                 var extractResult = BundleExtractor.ExtractBAContainer(null, bundlePath, baFolderPath, extractFolderPath);
                 extractResult.AssertSuccess();
 
                 var bootstrapperExtensionDatas = extractResult.SelectBootstrapperExtensionDataNodes("/be:BootstrapperExtensionData/be:BootstrapperExtension[@Id='Wix4UtilBootstrapperExtension_X86']");
-                Assert.Equal(1, bootstrapperExtensionDatas.Count);
-                Assert.Equal("<BootstrapperExtension Id='Wix4UtilBootstrapperExtension_X86'>" +
+                Assert.AreEqual(1, bootstrapperExtensionDatas.Count);
+                Assert.AreEqual("<BootstrapperExtension Id='Wix4UtilBootstrapperExtension_X86'>" +
                     "<WixWindowsFeatureSearch Id='DetectSHA2SupportId' Type='sha2CodeSigning' />" +
                     "</BootstrapperExtension>", bootstrapperExtensionDatas[0].GetTestXml());
 
@@ -394,7 +395,7 @@ namespace WixToolsetTest.Util
             }
         }
 
-        [Fact]
+        [TestMethod]
         public void CanCreateUserGroupWithComment()
         {
             var folder = TestData.Get(@"TestData\CreateGroup");
@@ -550,7 +551,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CanCreateUserAccountWithComment()
         {
             var folder = TestData.Get(@"TestData\CreateUser");
@@ -626,7 +627,7 @@ namespace WixToolsetTest.Util
             }, results.OrderBy(s => s).ToArray());
         }
 
-        [Fact]
+        [TestMethod]
         public void CannotBuildBundleWithSearchesUsingBuiltinVariableNames()
         {
             var folder = TestData.Get("TestData", "BundleWithSearches");
diff --git a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
index 16d0e138..4036c3ab 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj
+++ b/src/ext/Util/test/WixToolsetTest.Util/WixToolsetTest.Util.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>
diff --git a/src/ext/Util/util.cmd b/src/ext/Util/util.cmd
deleted file mode 100644
index 3c66e7d8..00000000
--- a/src/ext/Util/util.cmd
+++ /dev/null
@@ -1,45 +0,0 @@
-@setlocal
-@pushd %~dp0
-
-@set _C=Debug
-@set _L=%~dp0..\..\..\build\logs
-
-:parse_args
-@if /i "%1"=="release" set _C=Release
-@if /i "%1"=="inc" set _INC=1
-@if /i "%1"=="clean" set _CLEAN=1
-@if not "%1"=="" shift & goto parse_args
-
-@set _B=%~dp0..\..\..\build\Util.wixext\%_C%
-
-:: Clean
-
-@if "%_INC%"=="" call :clean
-@if NOT "%_CLEAN%"=="" goto :end
-
-@echo Building ext\Util %_C% using %_N%
-
-:: Build
-msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\ext_util_build.binlog || exit /b
-
-:: Test
-dotnet test ^
- %_B%\net6.0\WixToolsetTest.Util.dll ^
- --nologo -l "trx;LogFileName=%_L%\TestResults\util.wixext.trx" || exit /b
-
-:: Pack
-msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.Util.wixext.csproj || exit /b
-
-@goto :end
-
-:clean
-@rd /s/q "..\..\build\Util.wixext" 2> nul
-@del "..\..\build\artifacts\WixToolset.Util.wixext.*.nupkg" 2> nul
-@del "%_L%\ext_util_build.binlog" 2> nul
-@del "%_L%\TestResults\util.wixext.trx" 2> nul
-@rd /s/q "%USERPROFILE%\.nuget\packages\wixtoolset.util.wixext" 2> nul
-@exit /b
-
-:end
-@popd
-@endlocal
diff --git a/src/ext/Util/util_t.proj b/src/ext/Util/util_t.proj
new file mode 100644
index 00000000..e1da6adf
--- /dev/null
+++ b/src/ext/Util/util_t.proj
@@ -0,0 +1,17 @@
+<?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.Build.Traversal">
+  <ItemGroup>
+    <ProjectReference Include="test\WixToolsetTest.Util\WixToolsetTest.Util.csproj" />
+    <ProjectReference Include="wixext\WixToolset.Util.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
+  </ItemGroup>
+
+  <Target Name="WixClean" BeforeTargets="Restore" Condition="'$(SuppressWixClean)' != 'true'">
+    <RemoveDir Directories="$(RootBuildFolder)Util.wixext" />
+    <RemoveDir Directories="$(USERPROFILE)\.nuget\packages\wixtoolset.util.wixext" Condition="'$(NUGET_PACKAGES)' == ''" />
+    <RemoveDir Directories="$(NUGET_PACKAGES)\wixtoolset.util.wixext" Condition="'$(NUGET_PACKAGES)' != ''" />
+
+    <Delete Files="$(ArtifactsFolder)WixToolset.Util.wixext.*.nupkg" />
+  </Target>
+</Project>