Target VS2026 and .NET 10 for WiX v8.

VS2022/v143 toolsets are no longer required.

40 files changed, 146 insertions, 115 deletions

diff --git a/src/test/burn/Directory.wixproj.props b/src/test/burn/Directory.wixproj.props
index 9bda487e..56b5fec2 100644
--- a/src/test/burn/Directory.wixproj.props
+++ b/src/test/burn/Directory.wixproj.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName>
     <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath>
-    <OutputPath>$(OutputPath)net8.0-windows\TestData\$(TestGroupName)\</OutputPath>
+    <OutputPath>$(OutputPath)net10.0-windows\TestData\$(TestGroupName)\</OutputPath>
     <DefaultCompressionLevel>None</DefaultCompressionLevel>
     <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions>
     <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings>
diff --git a/src/test/burn/README.md b/src/test/burn/README.md
index 28284737..542fc5b7 100644
--- a/src/test/burn/README.md
+++ b/src/test/burn/README.md
@@ -10,8 +10,8 @@ They modify machine state so it's strongly recommended *not* to run these tests
 They should be run on a VM instead, where you can easily roll back.
 
 1. Run build.cmd to build everything (the tests will not automatically run).
-1. Copy the build\IntegrationBurn\Debug\net8.0-windows folder to your VM.
-1. Open an elevated command prompt and navigate to the net8.0-windows folder.
+1. Copy the build\IntegrationBurn\Debug\net10.0-windows folder to your VM.
+1. Open an elevated command prompt and navigate to the net10.0-windows folder.
 1. Run the runtests.cmd file to run the tests.
 
 You can modify the runtests.cmd to run specific tests.
diff --git a/src/test/burn/TestBA/TestBA.csproj b/src/test/burn/TestBA/TestBA.csproj
index e926833b..609bb5e5 100644
--- a/src/test/burn/TestBA/TestBA.csproj
+++ b/src/test/burn/TestBA/TestBA.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0-windows;net462</TargetFrameworks>
+    <TargetFrameworks>net10.0-windows;net462</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <AssemblyName>TestBA</AssemblyName>
     <RootNamespace>WixToolset.Test.BA</RootNamespace>
diff --git a/src/test/burn/TestBA/TestBA_x64.csproj b/src/test/burn/TestBA/TestBA_x64.csproj
index d552f09e..71062f24 100644
--- a/src/test/burn/TestBA/TestBA_x64.csproj
+++ b/src/test/burn/TestBA/TestBA_x64.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0-windows;net462</TargetFrameworks>
+    <TargetFrameworks>net10.0-windows;net462</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <AssemblyName>TestBA</AssemblyName>
     <RootNamespace>WixToolset.Test.BA</RootNamespace>
diff --git a/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj
index 2c414118..cf2ed285 100644
--- a/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj
+++ b/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj
@@ -17,7 +17,7 @@
   </ItemGroup>
   <!-- We do this dynamically to avoid committing such a large file to source control. -->
   <Target Name="CreateLargeFile" AfterTargets="BeforeBuild" Inputs="$(MSBuildProjectFullPath)" Outputs="$(MSBuildProjectDirectory)\fivegb.file">
-    <Exec Command='"$(BaseOutputPath)$(Configuration)\net8.0\win-x86\testexe.exe" /lf "fivegb.file|5368709120' WorkingDirectory="$(MSBuildProjectDirectory)" />
+    <Exec Command='"$(BaseOutputPath)$(Configuration)\net10.0\win-x86\testexe.exe" /lf "fivegb.file|5368709120' WorkingDirectory="$(MSBuildProjectDirectory)" />
   </Target>
   <!-- We do this to avoid copying such a large file to the VM to run the tests. -->
   <Target Name="DeleteLargeFile" AfterTargets="AfterBuild">
diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
index 5060077d..b646d075 100644
--- a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
@@ -17,8 +17,8 @@
 
   <!-- We do this dynamically to avoid committing so many files to source control. -->
   <Target Name="CreateThousandsOfFiles" AfterTargets="BeforeBuild">
-    <Exec Command='"$(BaseOutputPath)$(Configuration)\net8.0\win-x86\testexe.exe" /gf "BAPayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
-    <Exec Command='"$(BaseOutputPath)$(Configuration)\net8.0\win-x86\testexe.exe" /gf "PackagePayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
+    <Exec Command='"$(BaseOutputPath)$(Configuration)\net10.0\win-x86\testexe.exe" /gf "BAPayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
+    <Exec Command='"$(BaseOutputPath)$(Configuration)\net10.0\win-x86\testexe.exe" /gf "PackagePayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" />
   </Target>
 
   <Target Name="DeleteThousandsOfFiles" AfterTargets="AfterBuild">
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj
index ce39322b..a2424b8c 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj
+++ b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj
@@ -9,7 +9,7 @@
     <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net8.0-windows\win-x86" BindName="dncx86" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net10.0-windows\win-x86" BindName="dncx86" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj
index 118d8378..0f51b7f0 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj
+++ b/src/test/burn/TestData/PrereqBaTests/BundleC/BundleC.wixproj
@@ -9,7 +9,7 @@
     <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net8.0-windows\win-x86" BindName="dncx86" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net10.0-windows\win-x86" BindName="dncx86" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
diff --git a/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj
index ac1559ba..f67c6a84 100644
--- a/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj
+++ b/src/test/burn/TestData/PrereqBaTests/BundleE/BundleE.wixproj
@@ -9,7 +9,7 @@
     <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net8.0-windows\win-x86" BindName="dncx86" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net10.0-windows\win-x86" BindName="dncx86" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PrereqBaf\PrereqBaf.vcxproj" />
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
index 5dae879d..7a6c6bfd 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
@@ -8,7 +8,7 @@
   <ItemGroup>
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net462\win-x86" BindName="net2x86" />
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x86" BindName="net4x86" />
-    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net8.0-windows\win-x86" BindName="dncx86" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net10.0-windows\win-x86" BindName="dncx86" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\TestBA\TestBA.csproj" />
diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
index 68141044..95c5a9b9 100644
--- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
+++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj
@@ -9,7 +9,7 @@
   <ItemGroup>
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net462\win-x64" BindName="net2x64" />
     <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net472\win-x64" BindName="net4x64" />
-    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net8.0-windows\win-x64" BindName="dncx64" />
+    <BindInputPaths Include="$(BaseOutputPath)$(Configuration)\net10.0-windows\win-x64" BindName="dncx64" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\TestBA\TestBA_x64.csproj" />
diff --git a/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs b/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs
index 89efe183..55882340 100644
--- a/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs
+++ b/src/test/burn/TestData/WixIuiBaTests/InternalUIBundle/Bundle.wxs
@@ -9,7 +9,7 @@
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
   <!-- The only difference from the template should be the SplashScreen and uncompressed -->
-  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp">
+  <Bundle Name="~$(var.TestGroupName) - $(var.BundleName)" Version="$(var.TestVersion)" UpgradeCode="$(var.UpgradeCode)" Compressed="no" SplashScreenSourceFile="..\..\Manual\BafThmutilTesting\theme\star_transparent.bmp" IconSourceFile="..\..\WixStdBaTests\BundleA\test.ico">
     <Log Prefix="$(var.BundleLogDirectory)\~$(var.TestGroupName)_$(var.BundleName)" />
 
     <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
diff --git a/src/test/burn/TestExe/TestExe.csproj b/src/test/burn/TestExe/TestExe.csproj
index 9b88e195..4ed3d7e1 100644
--- a/src/test/burn/TestExe/TestExe.csproj
+++ b/src/test/burn/TestExe/TestExe.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net462</TargetFrameworks>
+    <TargetFrameworks>net10.0;net462</TargetFrameworks>
     <AssemblyName>TestExe</AssemblyName>
     <RootNamespace>TestExe</RootNamespace>
     <OutputType>Exe</OutputType>
diff --git a/src/test/burn/WixTestTools/WixTestTools.csproj b/src/test/burn/WixTestTools/WixTestTools.csproj
index 619ec974..ad516bc4 100644
--- a/src/test/burn/WixTestTools/WixTestTools.csproj
+++ b/src/test/burn/WixTestTools/WixTestTools.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
     <IsWixTestSupportProject>true</IsWixTestSupportProject>
   </PropertyGroup>
diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
index b821e32e..f6d1034b 100644
--- a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
+++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0-windows;net472</TargetFrameworks>
+    <TargetFrameworks>net10.0-windows;net472</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <AssemblyName>WixToolset.WixBA</AssemblyName>
     <RootNamespace>WixToolset.WixBA</RootNamespace>
diff --git a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
index 44d030a5..d7166f2a 100644
--- a/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
+++ b/src/test/burn/WixToolset.WixBA/WixToolset.WixBA_x64.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0-windows;net472</TargetFrameworks>
+    <TargetFrameworks>net10.0-windows;net472</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <AssemblyName>WixToolset.WixBA</AssemblyName>
     <RootNamespace>WixToolset.WixBA</RootNamespace>
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
index 1d9615bb..593bfdc3 100644
--- a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
+++ b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
     <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd
index 3f03216b..96ded4f5 100644
--- a/src/test/burn/test_burn.cmd
+++ b/src/test/burn/test_burn.cmd
@@ -17,8 +17,8 @@ msbuild -Restore -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\test
 msbuild -Restore TestData\TestData.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\test_burn_data_build.binlog || exit /b
 msbuild -Restore TestData6\TestData6.proj -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl:%_L%\test_burn_data6_build.binlog || exit /b
 
-"%_B%\net462\win-x86\testexe.exe" /dm "%_B%\net8.0-windows\testhost.exe"
-mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\net8.0-windows\testhost.exe"
+"%_B%\net462\win-x86\testexe.exe" /dm "%_B%\net10.0-windows\testhost.exe"
+mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\net10.0-windows\testhost.exe"
 
 @if not "%RuntimeTestsEnabled%"=="true" goto :LExit
 
diff --git a/src/test/msi/Directory.wixproj.props b/src/test/msi/Directory.wixproj.props
index 9325dcb6..6108ed4d 100644
--- a/src/test/msi/Directory.wixproj.props
+++ b/src/test/msi/Directory.wixproj.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName>
     <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath>
-    <OutputPath>$(OutputPath)net8.0-windows\TestData\$(TestGroupName)\</OutputPath>
+    <OutputPath>$(OutputPath)net10.0-windows\TestData\$(TestGroupName)\</OutputPath>
     <DefaultCompressionLevel>None</DefaultCompressionLevel>
     <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions>
     <SuppressValidation>true</SuppressValidation>
diff --git a/src/test/msi/README.md b/src/test/msi/README.md
index bb7d9ee4..8e7296a6 100644
--- a/src/test/msi/README.md
+++ b/src/test/msi/README.md
@@ -10,8 +10,8 @@ They modify machine state so it's strongly recommended *not* to run these tests
 They should be run on a VM instead, where you can easily roll back.
 
 1. Run build.cmd to build everything (the tests will not automatically run).
-1. Copy the build\IntegrationMsi\Debug\net8.0-windows folder to your VM.
-1. Open an elevated command prompt and navigate to the net8.0-windows folder.
+1. Copy the build\IntegrationMsi\Debug\net10.0-windows folder to your VM.
+1. Open an elevated command prompt and navigate to the net10.0-windows folder.
 1. Run the runtests.cmd file to run the tests.
 
 You can modify the runtests.cmd to run specific tests.
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj
index d2e7b2b6..0678cacc 100644
--- a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj
+++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj
@@ -28,25 +28,25 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -288,4 +288,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj
index f0bf8a5d..f73e5a58 100644
--- a/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj
+++ b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFramework>net10.0-windows</TargetFramework>
     <PlatformTarget>x64</PlatformTarget>
     <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
diff --git a/src/test/sandbox/setup_sandbox.bat b/src/test/sandbox/setup_sandbox.bat
index fac7ec4c..f1293aba 100644
--- a/src/test/sandbox/setup_sandbox.bat
+++ b/src/test/sandbox/setup_sandbox.bat
@@ -1,6 +1,6 @@
 @setlocal enabledelayedexpansion
 @echo off
-SET DOTNET_VERSION=8.0
+SET DOTNET_VERSION=10.0
 
 :MENU
 cls
diff --git a/src/test/test.cmd b/src/test/test.cmd
index 75ced392..7c363ba3 100644
--- a/src/test/test.cmd
+++ b/src/test/test.cmd
@@ -13,8 +13,7 @@
 
 @call burn\test_burn.cmd %_C% %_T% || exit /b
 @call msi\test_msi.cmd %_C% %_T% || exit /b
-
-dotnet test wix -c %_C% --nologo -l "trx;LogFileName=%_L%\TestResults\WixToolsetTest.WixE2ETests.trx" || exit /b
+@call wix\test_wix.cmd %_C% %_T% || exit /b
 
 @popd
 @endlocal
diff --git a/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj b/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj
index 3fc6a7c8..9ee22a81 100644
--- a/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj
+++ b/src/test/wix/TestData/CsprojClassLibraryMultiFramework/CsprojClassLibraryMultiFramework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net472</TargetFrameworks>
+    <TargetFrameworks>net10.0;net472</TargetFrameworks>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
diff --git a/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj b/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj
index aa5782dd..c2693a75 100644
--- a/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj
+++ b/src/test/wix/TestData/CsprojClassLibraryMultiTarget/CsprojClassLibraryMultiTarget.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net472</TargetFrameworks>
+    <TargetFrameworks>net10.0;net472</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj b/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj
index 095a48bd..0cdbdc3b 100644
--- a/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj
+++ b/src/test/wix/TestData/CsprojConsoleMultiFramework/CsprojConsoleMultiFramework.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net8.0;net472</TargetFrameworks>
+    <TargetFrameworks>net10.0;net472</TargetFrameworks>
     <RuntimeIdentifiers>win-x86</RuntimeIdentifiers>
   </PropertyGroup>
 
diff --git a/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.csproj b/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.csproj
index 8dd47979..815e7c6a 100644
--- a/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.csproj
+++ b/src/test/wix/TestData/CsprojConsoleNetCore/CsprojConsoleNetCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RuntimeIdentifiers>win-x86</RuntimeIdentifiers>
   </PropertyGroup>
 
diff --git a/src/test/wix/TestData/CsprojWebApplicationNetCore/CsprojWebApplicationNetCore.csproj b/src/test/wix/TestData/CsprojWebApplicationNetCore/CsprojWebApplicationNetCore.csproj
index cae0d3a6..de0517db 100644
--- a/src/test/wix/TestData/CsprojWebApplicationNetCore/CsprojWebApplicationNetCore.csproj
+++ b/src/test/wix/TestData/CsprojWebApplicationNetCore/CsprojWebApplicationNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/test/wix/TestData/CsprojWpfNetCore/CsprojWpfNetCore.csproj b/src/test/wix/TestData/CsprojWpfNetCore/CsprojWpfNetCore.csproj
index b1bf8781..56902842 100644
--- a/src/test/wix/TestData/CsprojWpfNetCore/CsprojWpfNetCore.csproj
+++ b/src/test/wix/TestData/CsprojWpfNetCore/CsprojWpfNetCore.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows7.0</TargetFramework>
+    <TargetFramework>net10.0-windows7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
diff --git a/src/test/wix/TestData/VcxprojConsoleApplication/VcxprojConsoleApplication.vcxproj b/src/test/wix/TestData/VcxprojConsoleApplication/VcxprojConsoleApplication.vcxproj
index 46ca4efd..1923687d 100644
--- a/src/test/wix/TestData/VcxprojConsoleApplication/VcxprojConsoleApplication.vcxproj
+++ b/src/test/wix/TestData/VcxprojConsoleApplication/VcxprojConsoleApplication.vcxproj
@@ -29,26 +29,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -144,4 +144,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/wix/TestData/VcxprojDll/VcxprojDll.vcxproj b/src/test/wix/TestData/VcxprojDll/VcxprojDll.vcxproj
index f889409e..a0fc6c0c 100644
--- a/src/test/wix/TestData/VcxprojDll/VcxprojDll.vcxproj
+++ b/src/test/wix/TestData/VcxprojDll/VcxprojDll.vcxproj
@@ -29,26 +29,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -171,4 +171,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/wix/TestData/VcxprojStaticLib/VcxprojStaticLib.vcxproj b/src/test/wix/TestData/VcxprojStaticLib/VcxprojStaticLib.vcxproj
index 0094f9bd..cd02f692 100644
--- a/src/test/wix/TestData/VcxprojStaticLib/VcxprojStaticLib.vcxproj
+++ b/src/test/wix/TestData/VcxprojStaticLib/VcxprojStaticLib.vcxproj
@@ -29,26 +29,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -166,4 +166,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/wix/TestData/VcxprojWindowsApp/VcxprojWindowsApp.vcxproj b/src/test/wix/TestData/VcxprojWindowsApp/VcxprojWindowsApp.vcxproj
index 7c2ae016..41c9b153 100644
--- a/src/test/wix/TestData/VcxprojWindowsApp/VcxprojWindowsApp.vcxproj
+++ b/src/test/wix/TestData/VcxprojWindowsApp/VcxprojWindowsApp.vcxproj
@@ -29,26 +29,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
+    <PlatformToolset>v145</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -157,4 +157,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs b/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs
index 93049fd3..fe3e7f28 100644
--- a/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs
+++ b/src/test/wix/TestData/WixprojLibraryMultiFramework/Library.wxs
@@ -1,13 +1,13 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
   <Fragment>
-    <ComponentGroup Id='CsprojClassLibraryMultiFrameworkNet80' Directory='ApplicationFolder' Subdirectory="net8.0">
+    <ComponentGroup Id='CsprojClassLibraryMultiFrameworkNet80' Directory='ApplicationFolder' Subdirectory="net10.0">
       <Component>
-        <File Id="Net80" Source='!(bindpath.CsprojConsoleMultiFramework.net8.0)CsprojConsoleMultiFramework.exe' />
-        <File Source='!(bindpath.CsprojConsoleMultiFramework.net8.0)CsprojConsoleMultiFramework.deps.json' />
-        <File Source='!(bindpath.CsprojConsoleMultiFramework.net8.0)CsprojConsoleMultiFramework.runtimeconfig.json' />
+        <File Id="Net80" Source='!(bindpath.CsprojConsoleMultiFramework.net10.0)CsprojConsoleMultiFramework.exe' />
+        <File Source='!(bindpath.CsprojConsoleMultiFramework.net10.0)CsprojConsoleMultiFramework.deps.json' />
+        <File Source='!(bindpath.CsprojConsoleMultiFramework.net10.0)CsprojConsoleMultiFramework.runtimeconfig.json' />
       </Component>
       <Component>
-        <File Source='!(bindpath.CsprojConsoleMultiFramework.net8.0)CsprojClassLibraryMultiFramework.dll' />
+        <File Source='!(bindpath.CsprojConsoleMultiFramework.net10.0)CsprojClassLibraryMultiFramework.dll' />
       </Component>
     </ComponentGroup>
   </Fragment>
diff --git a/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj b/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj
index ec224510..64ddf82f 100644
--- a/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj
+++ b/src/test/wix/TestData/WixprojLibraryMultiFramework/WixprojLibraryMultiFramework.wixproj
@@ -7,6 +7,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CsprojConsoleMultiFramework\CsprojConsoleMultiFramework.csproj"
-                      TargetFrameworks="net472;net8.0" Publish="true" />
+                      TargetFrameworks="net472;net10.0" Publish="true" />
   </ItemGroup>
 </Project>
diff --git a/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj b/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj
index bbe0f49b..6c0585ef 100644
--- a/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj
+++ b/src/test/wix/TestData/WixprojPackageCsprojWebApplicationNetCore/WixprojPackageCsprojWebApplicationNetCore.wixproj
@@ -1,7 +1,7 @@
 <!-- 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='WixToolset.Sdk'>
 <!-- <Project> -->
-  <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\net8.0\Sdk\Sdk.props' /> -->
+  <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\net10.0\Sdk\Sdk.props' /> -->
 
   <PropertyGroup>
     <!-- <WixBinDir>D:\src\wix4\build\wix\Debug\net472\</WixBinDir> -->
@@ -13,5 +13,5 @@
     <ProjectReference Include="..\CsprojWebApplicationNetCore\CsprojWebApplicationNetCore.csproj" Publish="true" />
   </ItemGroup>
 
-  <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\net8.0\Sdk\Sdk.targets' /> -->
+  <!-- <Import Sdk="WixToolset.Sdk" Project='D:\src\wix4\build\wix\Debug\net10.0\Sdk\Sdk.targets' /> -->
 </Project>
diff --git a/src/test/wix/WixE2E/WixE2E.csproj b/src/test/wix/WixE2E/WixE2E.csproj
index 055df524..934b7162 100644
--- a/src/test/wix/WixE2E/WixE2E.csproj
+++ b/src/test/wix/WixE2E/WixE2E.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>net472</TargetFramework>
-    <IsWixTestProject>true</IsWixTestProject>
+    <TargetFramework>net10.0</TargetFramework>
+    <IsWixMSTestProject>true</IsWixMSTestProject>
   </PropertyGroup>
 
   <ItemGroup>
@@ -12,6 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-     <PackageReference Include="WixInternal.TestSupport" /> 
+    <PackageReference Include="WixInternal.MSTestSupport" />
+    <PackageReference Include="WixInternal.Core.MSTestPackage" />
   </ItemGroup>
 </Project>
diff --git a/src/test/wix/WixE2E/WixE2EFixture.cs b/src/test/wix/WixE2E/WixE2EFixture.cs
index 512e80f5..abea0ec7 100644
--- a/src/test/wix/WixE2E/WixE2EFixture.cs
+++ b/src/test/wix/WixE2E/WixE2EFixture.cs
@@ -1,18 +1,21 @@
 // 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.
 
-namespace WixE2E
-{
-    using System;
-    using System.IO;
-    using System.Linq;
-    using System.Security.Cryptography;
-    using System.Text;
-    using WixInternal.TestSupport;
-    using Xunit;
+using System;
+using System.IO;
+using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using WixInternal.MSTestSupport;
+
+[assembly: DoNotParallelize]
 
+namespace WixToolsetTest.WixE2E
+{
+    [TestClass]
     public class WixE2EFixture
     {
-        [Fact]
+        [TestMethod]
         public void CanBuildWixlibMultiFramework()
         {
             var projectPath = TestData.Get("TestData", "WixprojLibraryMultiFramework", "WixprojLibraryMultiFramework.wixproj");
@@ -23,7 +26,7 @@ namespace WixE2E
             result.AssertSuccess();
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildWixlibWithNativeDll()
         {
             var projectPath = TestData.Get("TestData", "WixprojLibraryVcxprojDll", "WixprojLibraryVcxprojDll.wixproj");
@@ -34,7 +37,7 @@ namespace WixE2E
             result.AssertSuccess();
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildModuleWithWinFormsApp()
         {
             var projectPath = TestData.Get("TestData", "WixprojModuleCsprojWinFormsNetFx", "WixprojModuleCsprojWinFormsNetFx.wixproj");
@@ -45,7 +48,7 @@ namespace WixE2E
             result.AssertSuccess();
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildPackageWithWebApp()
         {
             var projectPath = TestData.Get("TestData", "WixprojPackageCsprojWebApplicationNetCore", "WixprojPackageCsprojWebApplicationNetCore.wixproj");
@@ -56,7 +59,7 @@ namespace WixE2E
             result.AssertSuccess();
         }
 
-        [Fact]
+        [TestMethod]
         public void CanBuildPackageWithNativeWindowsApp()
         {
             var projectPath = TestData.Get("TestData", "WixprojPackageVcxprojWindowsApp", "WixprojPackageVcxprojWindowsApp.wixproj");
@@ -75,7 +78,7 @@ namespace WixE2E
             }, signingStatement);
         }
 
-        [Fact]
+        [TestMethod]
         public void CanIncrementalBuildPackageWithNativeWindowsAppWithNoEdits()
         {
             var projectDirectory = TestData.Get("TestData", "WixprojPackageVcxprojWindowsApp");
@@ -101,7 +104,7 @@ namespace WixE2E
             WixAssert.CompareLineByLine(firstHashes, secondHashes);
         }
 
-        [Fact]
+        [TestMethod]
         public void CanIncrementalBuildPackageWithNativeWindowsAppWithEdits()
         {
             var projectDirectory = TestData.Get("TestData", "WixprojPackageVcxprojWindowsApp");
@@ -130,37 +133,38 @@ namespace WixE2E
             var secondHashes = secondBuiltFiles.Select(s => $"{s.Substring(projectBinPath.Length).TrimStart('\\')} with hash: {GetFileHash(s)}").ToArray();
 
             WixAssert.CompareLineByLine(firstRelativePaths, secondRelativePaths);
-            Assert.NotEqual(firstHashes, secondHashes);
+            Assert.AreNotEqual(firstHashes, secondHashes);
         }
 
-        [Fact(Skip = "Investigate if .NET Core WebApplications can be incrementally built")]
-        public void CanIncrementalBuildPackageWithNetCoreWebAppWithoutEdits()
-        {
-            var projectDirectory = TestData.Get("TestData", "WixprojPackageCsprojWebApplicationNetCore");
-            var projectPath = Path.Combine(projectDirectory, "WixprojPackageCsprojWebApplicationNetCore.wixproj");
-            var projectBinPath = Path.Combine(projectDirectory, "bin");
+        //[TestMethod]
+        //[Fact(Skip = "Investigate if .NET Core WebApplications can be incrementally built")]
+        //public void CanIncrementalBuildPackageWithNetCoreWebAppWithoutEdits()
+        //{
+        //    var projectDirectory = TestData.Get("TestData", "WixprojPackageCsprojWebApplicationNetCore");
+        //    var projectPath = Path.Combine(projectDirectory, "WixprojPackageCsprojWebApplicationNetCore.wixproj");
+        //    var projectBinPath = Path.Combine(projectDirectory, "bin");
 
-            CleanEverything();
+        //    CleanEverything();
 
-            var result = RestoreAndBuild(projectPath);
-            result.AssertSuccess();
+        //    var result = RestoreAndBuild(projectPath);
+        //    result.AssertSuccess();
 
-            var firstBuiltFiles = Directory.GetFiles(projectBinPath, "*.*", SearchOption.AllDirectories).ToArray();
-            var firstHashes = firstBuiltFiles.Select(s => $"{s.Substring(projectBinPath.Length).TrimStart('\\')} with hash: {GetFileHash(s)}").ToArray();
+        //    var firstBuiltFiles = Directory.GetFiles(projectBinPath, "*.*", SearchOption.AllDirectories).ToArray();
+        //    var firstHashes = firstBuiltFiles.Select(s => $"{s.Substring(projectBinPath.Length).TrimStart('\\')} with hash: {GetFileHash(s)}").ToArray();
 
-            //var packageWxsPath = Path.Combine(projectDirectory, "Package.wxs");
-            //File.SetLastWriteTime(packageWxsPath, DateTime.Now);
+        //    //var packageWxsPath = Path.Combine(projectDirectory, "Package.wxs");
+        //    //File.SetLastWriteTime(packageWxsPath, DateTime.Now);
 
-            // This should be an incremental build that does work because a file was updated.
-            //
-            result = RestoreAndBuild(projectPath);
-            result.AssertSuccess();
+        //    // This should be an incremental build that does work because a file was updated.
+        //    //
+        //    result = RestoreAndBuild(projectPath);
+        //    result.AssertSuccess();
 
-            var secondBuiltFiles = Directory.GetFiles(projectBinPath, "*.*", SearchOption.AllDirectories).ToArray();
-            var secondHashes = secondBuiltFiles.Select(s => $"{s.Substring(projectBinPath.Length).TrimStart('\\')} with hash: {GetFileHash(s)}").ToArray();
+        //    var secondBuiltFiles = Directory.GetFiles(projectBinPath, "*.*", SearchOption.AllDirectories).ToArray();
+        //    var secondHashes = secondBuiltFiles.Select(s => $"{s.Substring(projectBinPath.Length).TrimStart('\\')} with hash: {GetFileHash(s)}").ToArray();
 
-            WixAssert.CompareLineByLine(firstHashes, secondHashes);
-        }
+        //    WixAssert.CompareLineByLine(firstHashes, secondHashes);
+        //}
 
         private static void CleanEverything()
         {
@@ -179,11 +183,6 @@ namespace WixE2E
                     }
                 }
             }
-
-            foreach (var logFile in Directory.GetFiles(rootFolder, "*.binlog", SearchOption.AllDirectories))
-            {
-                File.Delete(logFile);
-            }
         }
 
         private static string GetFileHash(string path)
@@ -205,7 +204,23 @@ namespace WixE2E
 
         private static MsbuildRunnerResult RestoreAndBuild(string projectPath, bool x64 = true, bool suppressValidation = true)
         {
-            return MsbuildRunner.Execute(projectPath, new[] { "-Restore", "-v:m", "-bl", $"-p:SuppressValidation={suppressValidation}" }, x64);
+            var logPath = BinlogPath(projectPath);
+
+            var result = MsbuildRunner.Execute(projectPath, new[] { "-Restore", "-v:m", $"-bl:{logPath}", $"-p:SuppressValidation={suppressValidation}" }, x64);
+
+            return result;
+        }
+
+        private static string BinlogPath(string basePath)
+        {
+            var logPath = Path.GetFullPath(Path.Combine(Path.GetDirectoryName(basePath), "..", "..", "..", "..", "..", "logs", "tests", "WixE2E", Path.ChangeExtension(Path.GetFileName(basePath), ".binlog")));
+
+            while (File.Exists(logPath))
+            {
+                logPath = Path.ChangeExtension(logPath, ".X.binlog");
+            }
+
+            return logPath;
         }
     }
 }
diff --git a/src/test/wix/test_wix.cmd b/src/test/wix/test_wix.cmd
new file mode 100644
index 00000000..50f92c94
--- /dev/null
+++ b/src/test/wix/test_wix.cmd
@@ -0,0 +1,16 @@
+@setlocal
+@pushd %~dp0
+
+@set _RESULT=0
+@set _C=Debug
+@set _L=%~dp0..\..\..\build\logs
+:parse_args
+@if /i "%1"=="release" set _C=Release
+@if not "%1"=="" shift & goto parse_args
+
+@echo WiX integration tests %_C%
+
+msbuild -Restore WixE2E\WixE2E.csproj -t:Test -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\test_wix.binlog || exit /b
+
+@popd
+@endlocal