From 65e68bcfaf4b0ef9796cad4d5a470b3b3e72032f Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sat, 19 Jul 2025 22:25:25 -0400
Subject: Embiggen build perf.

- Move ext tests to targets for better MSBuild scheduling.
- Parallelize long-running tests.
- Disable Firewall ICEs for dev builds; they're redundant with
round-tripping and ICEs are mutex'd to make them painfully serial.
---
 src/ext/Bal/bal_t.proj                              |  6 +++++-
 .../BalExtensionFixture.cs                          |  4 ++++
 src/ext/ComPlus/complus_t.proj                      |  6 +++++-
 src/ext/Dependency/dependency_t.proj                |  6 +++++-
 src/ext/DirectX/directx_t.proj                      |  6 +++++-
 src/ext/Firewall/firewall_t.proj                    |  6 +++++-
 .../FirewallExtensionFixture.cs                     |  8 +++++++-
 src/ext/Http/http_t.proj                            |  6 +++++-
 .../WixToolsetTest.Http/HttpExtensionFixture.cs     |  4 ++++
 src/ext/Iis/iis_t.proj                              |  6 +++++-
 src/ext/Msmq/msmq_t.proj                            |  6 +++++-
 src/ext/NetFx/netfx_t.proj                          |  6 +++++-
 .../WixToolsetTest.Netfx/NetfxExtensionFixture.cs   |  4 ++++
 src/ext/PowerShell/powershell_t.proj                |  6 +++++-
 src/ext/Sql/sql_t.proj                              |  6 +++++-
 .../UI/test/WixToolsetTest.UI/UIExtensionFixture.cs |  4 ++++
 src/ext/UI/ui_t.proj                                |  6 +++++-
 .../WixToolsetTest.Util/UtilExtensionFixture.cs     |  7 +++++--
 src/ext/Util/util_t.proj                            |  6 +++++-
 src/ext/VisualStudio/visualstudio_t.proj            |  6 +++++-
 src/ext/ext_t.proj                                  | 21 ++++++++++++++++++---
 21 files changed, 116 insertions(+), 20 deletions(-)

(limited to 'src/ext')

diff --git a/src/ext/Bal/bal_t.proj b/src/ext/Bal/bal_t.proj
index bb8d44a2..80da207d 100644
--- a/src/ext/Bal/bal_t.proj
+++ b/src/ext/Bal/bal_t.proj
@@ -18,7 +18,7 @@
 
     <ProjectReference Include="test\examples\examples.proj" />
 
-    <ProjectReference Include="test\WixToolsetTest.BootstrapperApplications\WixToolsetTest.BootstrapperApplications.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.BootstrapperApplications\WixToolsetTest.BootstrapperApplications.csproj" />
 
     <!-- 
     Currently there are no unskipped unit tests in this project. Should that change,
@@ -41,4 +41,8 @@
     <Delete Files="$(ArtifactsFolder)WixToolset.BootstrapperApplications.wixext.*.nupkg" />
     <Delete Files="$(ArtifactsFolder)WixToolset.WixStandardBootstrapperApplicationFunctionApi.wixext.*.nupkg" />
   </Target>
+
+  <Target Name="WixTest">
+    <MSBuild Projects="test\WixToolsetTest.BootstrapperApplications\WixToolsetTest.BootstrapperApplications.csproj" Targets="Test" />
+  </Target>
 </Project>
diff --git a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs
index 6e24ad72..07d3dacb 100644
--- a/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs
+++ b/src/ext/Bal/test/WixToolsetTest.BootstrapperApplications/BalExtensionFixture.cs
@@ -1,5 +1,9 @@
 // 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.
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
+
 namespace WixToolsetTest.BootstrapperApplications
 {
     using System;
diff --git a/src/ext/ComPlus/complus_t.proj b/src/ext/ComPlus/complus_t.proj
index 8f187744..56f0cc99 100644
--- a/src/ext/ComPlus/complus_t.proj
+++ b/src/ext/ComPlus/complus_t.proj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj" />
     <ProjectReference Include="wixext\WixToolset.ComPlus.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
   </ItemGroup>
 
@@ -14,4 +14,8 @@
 
     <Delete Files="$(ArtifactsFolder)WixToolset.ComPlus.wixext.*.nupkg" />
   </Target>
+
+  <Target Name="WixTest">
+    <MSBuild Projects="test\WixToolsetTest.ComPlus\WixToolsetTest.ComPlus.csproj" Targets="Test" />
+  </Target>
 </Project>
diff --git a/src/ext/Dependency/dependency_t.proj b/src/ext/Dependency/dependency_t.proj
index 569ddd17..c4293806 100644
--- a/src/ext/Dependency/dependency_t.proj
+++ b/src/ext/Dependency/dependency_t.proj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="test\WixToolsetTest.Dependency\WixToolsetTest.Dependency.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.Dependency\WixToolsetTest.Dependency.csproj" />
     <ProjectReference Include="wixext\WixToolset.Dependency.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
   </ItemGroup>
 
@@ -14,4 +14,8 @@
 
     <Delete Files="$(ArtifactsFolder)WixToolset.Dependency.wixext.*.nupkg" />
   </Target>
+
+  <Target Name="WixTest">
+    <MSBuild Projects="test\WixToolsetTest.Dependency\WixToolsetTest.Dependency.csproj" Targets="Test" />
+  </Target>
 </Project>
diff --git a/src/ext/DirectX/directx_t.proj b/src/ext/DirectX/directx_t.proj
index f014465b..ff28ccb7 100644
--- a/src/ext/DirectX/directx_t.proj
+++ b/src/ext/DirectX/directx_t.proj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj" />
     <ProjectReference Include="wixext\WixToolset.DirectX.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
   </ItemGroup>
 
@@ -14,4 +14,8 @@
 
     <Delete Files="$(ArtifactsFolder)WixToolset.DirectX.wixext.*.nupkg" />
   </Target>
+
+  <Target Name="WixTest">
+    <MSBuild Projects="test\WixToolsetTest.DirectX\WixToolsetTest.DirectX.csproj" Targets="Test" />
+  </Target>
 </Project>
diff --git a/src/ext/Firewall/firewall_t.proj b/src/ext/Firewall/firewall_t.proj
index 72128805..f2cee0a0 100644
--- a/src/ext/Firewall/firewall_t.proj
+++ b/src/ext/Firewall/firewall_t.proj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj" />
     <ProjectReference Include="wixext\WixToolset.Firewall.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
   </ItemGroup>
 
@@ -14,4 +14,8 @@
 
     <Delete Files="$(ArtifactsFolder)WixToolset.Firewall.wixext.*.nupkg" />
   </Target>
+
+  <Target Name="WixTest">
+    <MSBuild Projects="test\WixToolsetTest.Firewall\WixToolsetTest.Firewall.csproj" Targets="Test" />
+  </Target>
 </Project>
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs b/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs
index 9b4cb2b1..3be8af0e 100644
--- a/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs
+++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/FirewallExtensionFixture.cs
@@ -1,7 +1,12 @@
 // 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.
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
+
 namespace WixToolsetTest.Firewall
 {
+    using System;
     using System.Data;
     using System.IO;
     using System.Linq;
@@ -687,8 +692,9 @@ namespace WixToolsetTest.Firewall
             var folder = TestData.Get(@"TestData", path);
             var build = new Builder(folder, typeof(FirewallExtensionFactory), new[] { folder });
             var output = Path.Combine(folder, $"Firewall{ruleName}.xml");
+            var isOfficialBuild = !String.IsNullOrEmpty(Environment.GetEnvironmentVariable("WixOfficialBuild"));
 
-            build.BuildAndDecompileAndBuild(Build, Decompile, output, validate: true);
+            build.BuildAndDecompileAndBuild(Build, Decompile, output, validate: isOfficialBuild);
 
             var doc = XDocument.Load(output);
             var actual = doc.Descendants()
diff --git a/src/ext/Http/http_t.proj b/src/ext/Http/http_t.proj
index ddcb64b4..b3de433f 100644
--- a/src/ext/Http/http_t.proj
+++ b/src/ext/Http/http_t.proj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="test\WixToolsetTest.Http\WixToolsetTest.Http.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.Http\WixToolsetTest.Http.csproj" />
     <ProjectReference Include="wixext\WixToolset.Http.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
   </ItemGroup>
 
@@ -14,4 +14,8 @@
 
     <Delete Files="$(ArtifactsFolder)WixToolset.Http.wixext.*.nupkg" />
   </Target>
+
+  <Target Name="WixTest">
+    <MSBuild Projects="test\WixToolsetTest.Http\WixToolsetTest.Http.csproj" Targets="Test" />
+  </Target>
 </Project>
diff --git a/src/ext/Http/test/WixToolsetTest.Http/HttpExtensionFixture.cs b/src/ext/Http/test/WixToolsetTest.Http/HttpExtensionFixture.cs
index c91ce937..7dcb9086 100644
--- a/src/ext/Http/test/WixToolsetTest.Http/HttpExtensionFixture.cs
+++ b/src/ext/Http/test/WixToolsetTest.Http/HttpExtensionFixture.cs
@@ -1,5 +1,9 @@
 // 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.
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
+
 namespace WixToolsetTest.Http
 {
     using Microsoft.VisualStudio.TestTools.UnitTesting;
diff --git a/src/ext/Iis/iis_t.proj b/src/ext/Iis/iis_t.proj
index 2238d785..2e05f3f1 100644
--- a/src/ext/Iis/iis_t.proj
+++ b/src/ext/Iis/iis_t.proj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj" />
     <ProjectReference Include="wixext\WixToolset.Iis.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
   </ItemGroup>
 
@@ -14,4 +14,8 @@
 
     <Delete Files="$(ArtifactsFolder)WixToolset.Iis.wixext.*.nupkg" />
   </Target>
+
+  <Target Name="WixTest">
+    <MSBuild Projects="test\WixToolsetTest.Iis\WixToolsetTest.Iis.csproj" Targets="Test" />
+  </Target>
 </Project>
diff --git a/src/ext/Msmq/msmq_t.proj b/src/ext/Msmq/msmq_t.proj
index 9eaab92f..639f7f77 100644
--- a/src/ext/Msmq/msmq_t.proj
+++ b/src/ext/Msmq/msmq_t.proj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="test\WixToolsetTest.Msmq\WixToolsetTest.Msmq.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.Msmq\WixToolsetTest.Msmq.csproj" />
     <ProjectReference Include="wixext\WixToolset.Msmq.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
   </ItemGroup>
 
@@ -14,4 +14,8 @@
 
     <Delete Files="$(ArtifactsFolder)WixToolset.Msmq.wixext.*.nupkg" />
   </Target>
+
+  <Target Name="WixTest">
+    <MSBuild Projects="test\WixToolsetTest.Msmq\WixToolsetTest.Msmq.csproj" Targets="Test" />
+  </Target>
 </Project>
diff --git a/src/ext/NetFx/netfx_t.proj b/src/ext/NetFx/netfx_t.proj
index 1c1b8a61..86996e42 100644
--- a/src/ext/NetFx/netfx_t.proj
+++ b/src/ext/NetFx/netfx_t.proj
@@ -4,7 +4,7 @@
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
     <ProjectReference Include="wixlib\netfx.wixproj" />
-    <ProjectReference Include="test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj" />
     <ProjectReference Include="wixext\WixToolset.Netfx.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
   </ItemGroup>
 
@@ -23,4 +23,8 @@
 
     <Delete Files="$(ArtifactsFolder)WixToolset.NetFx.wixext.*.nupkg" />
   </Target>
+
+  <Target Name="WixTest">
+    <MSBuild Projects="test\WixToolsetTest.Netfx\WixToolsetTest.Netfx.csproj" Targets="Test" />
+  </Target>
 </Project>
diff --git a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index 37f715bf..381270d4 100644
--- a/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/ext/NetFx/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -1,5 +1,9 @@
 // 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.
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
+
 namespace WixToolsetTest.Netfx
 {
     using System.IO;
diff --git a/src/ext/PowerShell/powershell_t.proj b/src/ext/PowerShell/powershell_t.proj
index a1d88013..8c12bdef 100644
--- a/src/ext/PowerShell/powershell_t.proj
+++ b/src/ext/PowerShell/powershell_t.proj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="test\WixToolsetTest.PowerShell\WixToolsetTest.Powershell.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.PowerShell\WixToolsetTest.Powershell.csproj" />
     <ProjectReference Include="wixext\WixToolset.PowerShell.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
   </ItemGroup>
 
@@ -14,4 +14,8 @@
 
     <Delete Files="$(ArtifactsFolder)WixToolset.PowerShell.wixext.*.nupkg" />
   </Target>
+
+  <Target Name="WixTest">
+    <MSBuild Projects="test\WixToolsetTest.PowerShell\WixToolsetTest.Powershell.csproj" Targets="Test" />
+  </Target>
 </Project>
diff --git a/src/ext/Sql/sql_t.proj b/src/ext/Sql/sql_t.proj
index 92c908d2..42450510 100644
--- a/src/ext/Sql/sql_t.proj
+++ b/src/ext/Sql/sql_t.proj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj" />
     <ProjectReference Include="wixext\WixToolset.Sql.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
   </ItemGroup>
 
@@ -14,4 +14,8 @@
 
     <Delete Files="$(ArtifactsFolder)WixToolset.Sql.wixext.*.nupkg" />
   </Target>
+
+  <Target Name="WixTest">
+    <MSBuild Projects="test\WixToolsetTest.Sql\WixToolsetTest.Sql.csproj" Targets="Test" />
+  </Target>
 </Project>
diff --git a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
index ae3a49be..9bc82fcf 100644
--- a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
+++ b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
@@ -1,5 +1,9 @@
 // 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.
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
+
 namespace WixToolsetTest.UI
 {
     using System.IO;
diff --git a/src/ext/UI/ui_t.proj b/src/ext/UI/ui_t.proj
index 6ac63cfe..895c0323 100644
--- a/src/ext/UI/ui_t.proj
+++ b/src/ext/UI/ui_t.proj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="test\WixToolsetTest.UI\WixToolsetTest.UI.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.UI\WixToolsetTest.UI.csproj" />
     <ProjectReference Include="wixext\WixToolset.UI.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
   </ItemGroup>
 
@@ -14,4 +14,8 @@
 
     <Delete Files="$(ArtifactsFolder)WixToolset.UI.wixext.*.nupkg" />
   </Target>
+
+  <Target Name="WixTest">
+    <MSBuild Projects="test\WixToolsetTest.UI\WixToolsetTest.UI.csproj" Targets="Test" />
+  </Target>
 </Project>
diff --git a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
index 03d87e4e..bb00717f 100644
--- a/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+++ b/src/ext/Util/test/WixToolsetTest.Util/UtilExtensionFixture.cs
@@ -1,15 +1,18 @@
 // 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.
 
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+[assembly: Parallelize(Scope = ExecutionScope.MethodLevel)]
+
 namespace WixToolsetTest.Util
 {
-    using System;
     using System.IO;
     using System.Linq;
     using System.Xml;
     using System.Xml.Linq;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
-    using WixInternal.MSTestSupport;
     using WixInternal.Core.MSTestPackage;
+    using WixInternal.MSTestSupport;
     using WixToolset.Util;
 
     [TestClass]
diff --git a/src/ext/Util/util_t.proj b/src/ext/Util/util_t.proj
index 6ec63476..02be4b49 100644
--- a/src/ext/Util/util_t.proj
+++ b/src/ext/Util/util_t.proj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="test\WixToolsetTest.Util\WixToolsetTest.Util.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.Util\WixToolsetTest.Util.csproj" />
     <ProjectReference Include="wixext\WixToolset.Util.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
   </ItemGroup>
 
@@ -14,4 +14,8 @@
 
     <Delete Files="$(ArtifactsFolder)WixToolset.Util.wixext.*.nupkg" />
   </Target>
+
+  <Target Name="WixTest">
+    <MSBuild Projects="test\WixToolsetTest.Util\WixToolsetTest.Util.csproj" Targets="Test" />
+  </Target>
 </Project>
diff --git a/src/ext/VisualStudio/visualstudio_t.proj b/src/ext/VisualStudio/visualstudio_t.proj
index 9b3f5b4f..d6c101e6 100644
--- a/src/ext/VisualStudio/visualstudio_t.proj
+++ b/src/ext/VisualStudio/visualstudio_t.proj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.Build.Traversal">
   <ItemGroup>
-    <ProjectReference Include="test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj" Targets="Test" />
+    <ProjectReference Include="test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj" />
     <ProjectReference Include="wixext\WixToolset.VisualStudio.wixext.csproj" Targets="Pack" Properties="NoBuild=true" />
   </ItemGroup>
 
@@ -14,4 +14,8 @@
 
     <Delete Files="$(ArtifactsFolder)WixToolset.VisualStudio.wixext.*.nupkg" />
   </Target>
+
+  <Target Name="WixTest">
+    <MSBuild Projects="test\WixToolsetTest.VisualStudio\WixToolsetTest.VisualStudio.csproj" Targets="Test" />
+  </Target>
 </Project>
diff --git a/src/ext/ext_t.proj b/src/ext/ext_t.proj
index b51f3425..f9febb2e 100644
--- a/src/ext/ext_t.proj
+++ b/src/ext/ext_t.proj
@@ -7,18 +7,33 @@
     <ProjectReference Include="Util\util_t.proj" BuildInParallel="false" Targets="Restore;Build" />
     <ProjectReference Include="Bal\bal_t.proj" BuildInParallel="false" Targets="Restore;Build" />
 
-    <ProjectReference Include="NetFx\netfx_t.proj" BuildInParallel="false" Targets="Restore;Build" />
+    <ProjectReference Include="Firewall\firewall_t.proj" Targets="Restore;Build" />
+    <ProjectReference Include="UI\ui_t.proj" Targets="Restore;Build" />
     <ProjectReference Include="ComPlus\complus_t.proj" Targets="Restore;Build" />
     <ProjectReference Include="Dependency\dependency_t.proj" Targets="Restore;Build" />
     <ProjectReference Include="DirectX\directx_t.proj" Targets="Restore;Build" />
-    <ProjectReference Include="Firewall\firewall_t.proj" Targets="Restore;Build" />
     <ProjectReference Include="Http\http_t.proj" Targets="Restore;Build" />
     <ProjectReference Include="Iis\iis_t.proj" Targets="Restore;Build" />
     <ProjectReference Include="Msmq\msmq_t.proj" Targets="Restore;Build" />
     <ProjectReference Include="NetFx\netfx_t.proj" Targets="Restore;Build" />
     <ProjectReference Include="PowerShell\powershell_t.proj" Targets="Restore;Build" />
     <ProjectReference Include="Sql\sql_t.proj" Targets="Restore;Build" />
-    <ProjectReference Include="UI\ui_t.proj" Targets="Restore;Build" />
     <ProjectReference Include="VisualStudio\visualstudio_t.proj" Targets="Restore;Build" />
+
+    <ProjectReference Include="Firewall\firewall_t.proj" Targets="WixTest" />
+    <ProjectReference Include="UI\ui_t.proj" Targets="WixTest" />
+    <ProjectReference Include="Util\util_t.proj" Targets="WixTest" />
+    <ProjectReference Include="Bal\bal_t.proj" Targets="WixTest" />
+    <ProjectReference Include="ComPlus\complus_t.proj" Targets="WixTest" />
+    <ProjectReference Include="Dependency\dependency_t.proj" Targets="WixTest" />
+    <ProjectReference Include="DirectX\directx_t.proj" Targets="WixTest" />
+    <ProjectReference Include="Http\http_t.proj" Targets="WixTest" />
+    <ProjectReference Include="Iis\iis_t.proj" Targets="WixTest" />
+    <ProjectReference Include="Msmq\msmq_t.proj" Targets="WixTest" />
+    <ProjectReference Include="NetFx\netfx_t.proj" Targets="WixTest" />
+    <ProjectReference Include="PowerShell\powershell_t.proj" Targets="WixTest" />
+    <ProjectReference Include="Sql\sql_t.proj" Targets="WixTest" />
+    <ProjectReference Include="VisualStudio\visualstudio_t.proj" Targets="WixTest" />
+
   </ItemGroup>
 </Project>
-- 
cgit v1.2.3-55-g6feb