4 files changed, 26 insertions, 28 deletions

diff --git a/src/ext/ComPlus/complus.cmd b/src/ext/ComPlus/complus.cmd
deleted file mode 100644
index 3b3a5772..00000000
--- a/src/ext/ComPlus/complus.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 ComPlus.wixext build %_C%
-
-:: Build
-msbuild -Restore -p:Configuration=%_C% -tl -nologo -warnaserror || exit /b
-
-:: Test
-dotnet test -c %_C% --no-build test\WixToolsetTest.ComPlus || exit /b
-
-:: Pack
-msbuild -t:Pack -p:Configuration=%_C% -tl -nologo -warnaserror -p:NoBuild=true wixext\WixToolset.ComPlus.wixext.csproj || exit /b
-
-@popd
-@endlocal
\ No newline at end of file
diff --git a/src/ext/ComPlus/complus_t.proj b/src/ext/ComPlus/complus_t.proj
new file mode 100644
index 00000000..439856b6
--- /dev/null
+++ b/src/ext/ComPlus/complus_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.ComPlus\WixToolsetTest.ComPlus.csproj" />
+    <ProjectReference Include="wixext\WixToolset.ComPlus.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
+  </ItemGroup>
+
+  <Target Name="WixClean" BeforeTargets="Restore" Condition="'$(SuppressWixClean)' != 'true'">
+    <RemoveDir Directories="$(RootBuildFolder)complus.wixext" />
+    <RemoveDir Directories="$(USERPROFILE)\.nuget\packages\wixtoolset.complus.wixext" Condition="'$(NUGET_PACKAGES)' == ''" />
+    <RemoveDir Directories="$(NUGET_PACKAGES)\wixtoolset.complus.wixext" Condition="'$(NUGET_PACKAGES)' != ''" />
+
+    <Delete Files="$(ArtifactsFolder)WixToolset.ComPlus.wixext.*.nupkg" />
+  </Target>
+</Project>
diff --git a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs
index 17c5eb0f..7b38ef54 100644
--- a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs
+++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/ComPlusExtensionFixture.cs
@@ -3,14 +3,15 @@
 namespace WixToolsetTest.ComPlus
 {
     using System.Linq;
-    using WixInternal.TestSupport;
-    using WixInternal.Core.TestPackage;
+    using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using WixInternal.MSTestSupport;
+    using WixInternal.Core.MSTestPackage;
     using WixToolset.ComPlus;
-    using Xunit;
 
+    [TestClass]
     public class ComPlusExtensionFixture
     {
-        [Fact]
+        [TestMethod]
         public void CanBuildUsingComPlusPartition()
         {
             var folder = TestData.Get(@"TestData\UsingComPlusPartition");
diff --git a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
index a9e9dbef..d0a7081b 100644
--- a/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj
+++ b/src/ext/ComPlus/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.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>