4 files changed, 28 insertions, 30 deletions

diff --git a/src/ext/PowerShell/powershell_t.proj b/src/ext/PowerShell/powershell_t.proj
new file mode 100644
index 00000000..da54d629
--- /dev/null
+++ b/src/ext/PowerShell/powershell_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.PowerShell\WixToolsetTest.Powershell.csproj" />
+    <ProjectReference Include="wixext\WixToolset.PowerShell.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
+  </ItemGroup>
+
+  <Target Name="WixClean" BeforeTargets="Restore" Condition="'$(SuppressWixClean)' != 'true'">
+    <RemoveDir Directories="$(RootBuildFolder)PowerShell.wixext" />
+    <RemoveDir Directories="$(USERPROFILE)\.nuget\packages\wixtoolset.PowerShell.wixext" Condition="'$(NUGET_PACKAGES)' == ''" />
+    <RemoveDir Directories="$(NUGET_PACKAGES)\wixtoolset.PowerShell.wixext" Condition="'$(NUGET_PACKAGES)' != ''" />
+
+    <Delete Files="$(ArtifactsFolder)WixToolset.PowerShell.wixext.*.nupkg" />
+  </Target>
+</Project>
diff --git a/src/ext/PowerShell/ps.cmd b/src/ext/PowerShell/ps.cmd
deleted file mode 100644
index 4a8aa61e..00000000
--- a/src/ext/PowerShell/ps.cmd
+++ /dev/null
@@ -1,21 +0,0 @@
-@setlocal
-@pushd %~dp0
-
-@set _C=Debug
-:parse_args
-@if /i "%1"=="release" set _C=Release
-@if not "%1"=="" shift & goto parse_args
-
-@echo PowerShell.wixext build %_C%
-
-:: Build
-msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b
-
-:: Test
-dotnet test -c %_C% --no-build test\WixToolsetTest.PowerShell || exit /b
-
-:: Pack
-msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.PowerShell.wixext.csproj || exit /b
-
-@popd
-@endlocal
diff --git a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/PowerShellExtensionFixture.cs b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/PowerShellExtensionFixture.cs
index eafda99f..a1dc3282 100644
--- a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/PowerShellExtensionFixture.cs
+++ b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/PowerShellExtensionFixture.cs
@@ -2,14 +2,15 @@
 
 namespace WixToolsetTest.PowerShell
 {
-    using WixInternal.TestSupport;
-    using WixInternal.Core.TestPackage;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using WixInternal.MSTestSupport;
+    using WixInternal.Core.MSTestPackage;
     using WixToolset.PowerShell;
-    using Xunit;
 
+    [TestClass]
     public class PowerShellExtensionFixture
     {
-        [Fact]
+        [TestMethod]
         public void CantBuildUsingTypesFileWithoutSnapIn()
         {
             var folder = TestData.Get(@"TestData\TypesFile");
@@ -19,8 +20,8 @@ namespace WixToolsetTest.PowerShell
             var results = build.BuildAndQuery(args => {
                 wixRunnerResult = WixRunner.Execute(args);
             });
-            Assert.NotNull(wixRunnerResult);
-            Assert.Equal((int)PSErrors.Ids.NeitherIdSpecified, wixRunnerResult.ExitCode);
+            Assert.IsNotNull(wixRunnerResult);
+            Assert.AreEqual((int)PSErrors.Ids.NeitherIdSpecified, wixRunnerResult.ExitCode);
         }
     }
 }
diff --git a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj
index 347ca1ed..cff13cb7 100644
--- a/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.csproj
+++ b/src/ext/PowerShell/test/WixToolsetTest.PowerShell/WixToolsetTest.Powershell.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>