53 files changed, 262 insertions, 176 deletions
diff --git a/src/ext/Bal/README.md b/src/ext/Bal/README.md
index 5e969c4f..009615dd 100644
--- a/src/ext/Bal/README.md
+++ b/src/ext/Bal/README.md
@@ -20,9 +20,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto
 Add the WiX Extension as a PackageReference to your .wixproj:
 ```
-<Project Sdk="WixToolset.Sdk/6.0.0">
+<Project Sdk="WixToolset.Sdk/7.0.0">
  <ItemGroup>
-    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" Version="7.0.0" />
  </ItemGroup>
 </Project>
 ```
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/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj
index 1179bea7..aea77d1b 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj
@@ -1,14 +1,6 @@
 <!-- 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">
    <ItemGroup>
-        <BindPath Include="$(OutputPath)publish\Example.EarliestCoreMBA\scd" />
+        <BindPath Include="$(OutputPath)publish\Example.EarliestCoreMBA\scd" BindName="ba.payloads" />
-        <HarvestDirectory Include="$(OutputPath)publish\Example.EarliestCoreMBA\scd">
-            <DirectoryRefId>publish.Example.EarliestCoreMBA.scd</DirectoryRefId>
-            <Transforms>ba.xslt</Transforms>
-        </HarvestDirectory>
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="WixToolset.Heat" />
    </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
index 38a167f1..68b697e7 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs
@@ -1,9 +1,11 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="SCDEarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplication SourceFile="Example.EarliestCoreMBA.exe">
+        <BootstrapperApplication SourceFile="!(bindpath.ba.payloads)\Example.EarliestCoreMBA.exe">
-            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> -->
+            <Payloads Include="!(bindpath.ba.payloads)\**">
-            <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.scd" />
+              <Exclude Files="!(bindpath.ba.payloads)\Example.EarliestCoreMBA.exe" />
+            </Payloads>
        </BootstrapperApplication>
        <Chain>
            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe"  PerMachine="yes" />
        </Chain>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/ba.xslt b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/ba.xslt
deleted file mode 100644
index d30b2564..00000000
--- a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/ba.xslt
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl"
-    xmlns:wix="http://wixtoolset.org/schemas/v4/wxs"
->
-    <xsl:output method="xml" indent="yes"/>
-    <xsl:template match="@* | node()">
-        <xsl:copy>
-            <xsl:apply-templates select="@* | node()"/>
-        </xsl:copy>
-    </xsl:template>
-    <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.EarliestCoreMBA.exe']" />
-</xsl:stylesheet>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj
index f9926550..5475022c 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj
@@ -1,14 +1,6 @@
 <!-- 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">
    <ItemGroup>
-        <BindInputPaths Include="$(OutputPath)publish\Example.EarliestCoreMBA\trimmedscd" />
+        <BindInputPaths Include="$(OutputPath)publish\Example.EarliestCoreMBA\trimmedscd" BindName="ba.payloads" />
-        <HarvestDirectory Include="$(OutputPath)publish\Example.EarliestCoreMBA\trimmedscd">
-            <DirectoryRefId>publish.Example.EarliestCoreMBA.trimmedscd</DirectoryRefId>
-            <Transforms>ba.xslt</Transforms>
-        </HarvestDirectory>
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="WixToolset.Heat" />
    </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
index bf4ad6e3..8895b279 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
@@ -1,9 +1,11 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="TrimmedSCDEarliestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplication SourceFile="SourceDir\Example.EarliestCoreMBA.exe" >
+        <BootstrapperApplication SourceFile="!(bindpath.ba.payloads)\Example.EarliestCoreMBA.exe" >
-            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> -->
+            <Payloads Include="!(bindpath.ba.payloads)\**">
-            <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.trimmedscd" />
+              <Exclude Files="!(bindpath.ba.payloads)\Example.EarliestCoreMBA.exe" />
+            </Payloads>
        </BootstrapperApplication>
        <Chain>
            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />
        </Chain>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt
deleted file mode 100644
index d30b2564..00000000
--- a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl"
-    xmlns:wix="http://wixtoolset.org/schemas/v4/wxs"
->
-    <xsl:output method="xml" indent="yes"/>
-    <xsl:template match="@* | node()">
-        <xsl:copy>
-            <xsl:apply-templates select="@* | node()"/>
-        </xsl:copy>
-    </xsl:template>
-    <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.EarliestCoreMBA.exe']" />
-</xsl:stylesheet>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj
index 048e3c97..73582984 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj
+++ b/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj
@@ -1,14 +1,6 @@
 <!-- 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">
    <ItemGroup>
-        <BindInputPaths Include="$(OutputPath)publish\Example.LatestCoreMBA\scd" />
+        <BindInputPaths Include="$(OutputPath)publish\Example.LatestCoreMBA\scd" BindName="ba.payloads" />
-        <HarvestDirectory Include="$(OutputPath)publish\Example.LatestCoreMBA\scd">
-            <DirectoryRefId>publish.Example.LatestCoreMBA.scd</DirectoryRefId>
-            <Transforms>ba.xslt</Transforms>
-        </HarvestDirectory>
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="WixToolset.Heat" />
    </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
index 0022b690..1f379b59 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
+++ b/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs
@@ -1,9 +1,11 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="SCDLatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplication SourceFile="Example.LatestCoreMBA.exe">
+        <BootstrapperApplication SourceFile="!(bindpath.ba.payloads)\Example.LatestCoreMBA.exe">
-            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> -->
+            <Payloads Include="!(bindpath.ba.payloads)\**">
-            <PayloadGroupRef Id="publish.Example.LatestCoreMBA.scd" />
+              <Exclude Files="!(bindpath.ba.payloads)\Example.LatestCoreMBA.exe" />
+            </Payloads>
        </BootstrapperApplication>
        <Chain>
            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />
        </Chain>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt b/src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt
deleted file mode 100644
index f606296e..00000000
--- a/src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl"
-    xmlns:wix="http://wixtoolset.org/schemas/v4/wxs"
->
-    <xsl:output method="xml" indent="yes"/>
-    <xsl:template match="@* | node()">
-        <xsl:copy>
-            <xsl:apply-templates select="@* | node()"/>
-        </xsl:copy>
-    </xsl:template>
-    <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.LatestCoreMBA.exe']" />
-</xsl:stylesheet>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj
index 056bf2bb..532f09b4 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj
+++ b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj
@@ -1,14 +1,6 @@
 <!-- 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">
    <ItemGroup>
-        <BindInputPaths Include="$(OutputPath)publish\Example.LatestCoreMBA\trimmedscd" />
+        <BindInputPaths Include="$(OutputPath)publish\Example.LatestCoreMBA\trimmedscd" BindName="ba.payloads" />
-        <HarvestDirectory Include="$(OutputPath)publish\Example.LatestCoreMBA\trimmedscd">
-            <DirectoryRefId>publish.Example.LatestCoreMBA.trimmedscd</DirectoryRefId>
-            <Transforms>ba.xslt</Transforms>
-        </HarvestDirectory>
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="WixToolset.Heat" />
    </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
index 322a27a3..cd32628a 100644
--- a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
+++ b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs
@@ -1,9 +1,11 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
    <Bundle Name="TrimmedSCDLatestCoreMBA" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="5CE5B5C7-4B6B-4B95-B297-731F1F956533">
-        <BootstrapperApplication SourceFile="Example.LatestCoreMBA.exe">
+        <BootstrapperApplication SourceFile="!(bindpath.ba.payloads)\Example.LatestCoreMBA.exe">
-            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> -->
+            <Payloads Include="!(bindpath.ba.payloads)\**">
-            <PayloadGroupRef Id="publish.Example.LatestCoreMBA.trimmedscd" />
+              <Exclude Files="!(bindpath.ba.payloads)\Example.LatestCoreMBA.exe" />
+            </Payloads>
        </BootstrapperApplication>
        <Chain>
            <ExePackage DetectCondition="none" UninstallArguments="-foo" SourceFile="..\.data\notanexe.exe" PerMachine="yes" />
        </Chain>
diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt
deleted file mode 100644
index f606296e..00000000
--- a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl"
-    xmlns:wix="http://wixtoolset.org/schemas/v4/wxs"
->
-    <xsl:output method="xml" indent="yes"/>
-    <xsl:template match="@* | node()">
-        <xsl:copy>
-            <xsl:apply-templates select="@* | node()"/>
-        </xsl:copy>
-    </xsl:template>
-    <xsl:template match="wix:Payload[@SourceFile='SourceDir\Example.LatestCoreMBA.exe']" />
-</xsl:stylesheet>
diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj
index c1544766..e439c288 100644
--- a/src/ext/Bal/test/examples/examples.proj
+++ b/src/ext/Bal/test/examples/examples.proj
@@ -34,16 +34,12 @@
          Condition="'%(CoreMBAProject.SkipFDD)'==''" />
    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\scd" -r win-x64 -c $(Configuration) --self-contained true "%(CoreMBAProject.Identity)"'
          Condition="'%(CoreMBAProject.SkipSCD)'==''" />
-    <!--
-    Publishing a library is "undefined" (per https://github.com/dotnet/runtime/issues/91535)
-    and is now a build error. This will go away when BAs go out of proc, so not spending a
-    lot of time to keep building trimmed in VS 17.8.
-    -->
    <Exec Command='dotnet publish -o "%(CoreMBAProject.PublishPath)\trimmedscd" -r win-x64 -c $(Configuration) --self-contained true -p:PublishTrimmed=false -p:TrimMode=%(CoreMBAProject.TrimMode) "%(CoreMBAProject.Identity)"'
          Condition="'%(CoreMBAProject.TrimMode)'!=''" />
  </Target>
  <ItemGroup>
+    <ProjectReference Include="..\..\wixext\WixToolset.BootstrapperApplications.wixext.csproj" />
    <ProjectReference Include="**\*.wixproj" />
  </ItemGroup>
 </Project>
diff --git a/src/ext/ComPlus/README.md b/src/ext/ComPlus/README.md
index 2412a6d1..01f60df4 100644
--- a/src/ext/ComPlus/README.md
+++ b/src/ext/ComPlus/README.md
@@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto
 Add the WiX Extension as a PackageReference to your .wixproj:
 ```
-<Project Sdk="WixToolset.Sdk/6.0.0">
+<Project Sdk="WixToolset.Sdk/7.0.0">
  <ItemGroup>
-    <PackageReference Include="WixToolset.ComPlus.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.ComPlus.wixext" Version="7.0.0" />
  </ItemGroup>
 </Project>
 ```
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/README.md b/src/ext/Dependency/README.md
index 0d7fd7b3..2ed031f2 100644
--- a/src/ext/Dependency/README.md
+++ b/src/ext/Dependency/README.md
@@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto
 Add the WiX Extension as a PackageReference to your .wixproj:
 ```
-<Project Sdk="WixToolset.Sdk/6.0.0">
+<Project Sdk="WixToolset.Sdk/7.0.0">
  <ItemGroup>
-    <PackageReference Include="WixToolset.Dependency.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.Dependency.wixext" Version="7.0.0" />
  </ItemGroup>
 </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/README.md b/src/ext/DirectX/README.md
index 2f9f3f08..cceaa105 100644
--- a/src/ext/DirectX/README.md
+++ b/src/ext/DirectX/README.md
@@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto
 Add the WiX Extension as a PackageReference to your .wixproj:
 ```
-<Project Sdk="WixToolset.Sdk/6.0.0">
+<Project Sdk="WixToolset.Sdk/7.0.0">
  <ItemGroup>
-    <PackageReference Include="WixToolset.DirectX.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.DirectX.wixext" Version="7.0.0" />
  </ItemGroup>
 </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/README.md b/src/ext/Firewall/README.md
index bd2b3fce..eac3acf9 100644
--- a/src/ext/Firewall/README.md
+++ b/src/ext/Firewall/README.md
@@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto
 Add the WiX Extension as a PackageReference to your .wixproj:
 ```
-<Project Sdk="WixToolset.Sdk/6.0.0">
+<Project Sdk="WixToolset.Sdk/7.0.0">
  <ItemGroup>
-    <PackageReference Include="WixToolset.Firewall.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.Firewall.wixext" Version="7.0.0" />
  </ItemGroup>
 </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 4b9aecd7..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;
@@ -621,6 +626,39 @@ namespace WixToolsetTest.Firewall
            }, locals.ToArray());
        }
+        [TestMethod]
+        public void CanDecompileWix4FirewallPackage()
+        {
+            var folder = TestData.Get(@"TestData\DecompileWix4Firewall");
+            var output = Path.Combine(folder, "DecompiledWix4Firewall.xml");
+            var result = WixRunner.Execute(
+                "msi",
+                "decompile",
+                "-ext", Path.GetFullPath(typeof(FirewallExtensionFactory).Assembly.Location),
+                Path.Combine(folder, "Firewall4.msi"),
+                "-o", output
+                );
+            result.AssertSuccess();
+            var doc = XDocument.Load(output);
+            var actual = doc.Descendants()
+                .Where(e => e.Name.Namespace == "http://wixtoolset.org/schemas/v4/wxs/firewall")
+                .Select(fe => new { Name = fe.Name.LocalName, Attributes = fe.Attributes().Select(a => $"{a.Name.LocalName}={a.Value}").ToArray() })
+                .ToArray();
+            WixAssert.CompareLineByLine(new[]
+            {
+                "FirewallException",
+                "RemoteAddress",
+                "RemoteAddress",
+                "RemoteAddress",
+                "RemoteAddress",
+                "RemoteAddress",
+                "FirewallException",
+            }, actual.Select(a => a.Name).ToArray());
+        }
        private static void Build(string[] args)
        {
            var result = WixRunner.Execute(args);
@@ -654,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/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/Firewall4.msi b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/Firewall4.msi
new file mode 100644
index 00000000..1dde5df4
--- /dev/null
+++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/Firewall4.msi
Binary files differ
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/ReferenceSource/Firewall4.wixproj b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/ReferenceSource/Firewall4.wixproj
new file mode 100644
index 00000000..0098d7ac
--- /dev/null
+++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/ReferenceSource/Firewall4.wixproj
@@ -0,0 +1,6 @@
+<Project Sdk="WixToolset.Sdk/4.0.6">
+  <ItemGroup>
+    <PackageVersion Update="WixToolset.Firewall.wixext" Version="4.0.6" />
+    <PackageReference Include="WixToolset.Firewall.wixext" />
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/ReferenceSource/Firewall4.wxs b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/ReferenceSource/Firewall4.wxs
new file mode 100644
index 00000000..8a89ad6c
--- /dev/null
+++ b/src/ext/Firewall/test/WixToolsetTest.Firewall/TestData/DecompileWix4Firewall/ReferenceSource/Firewall4.wxs
@@ -0,0 +1,36 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:fw="http://wixtoolset.org/schemas/v4/wxs/firewall">
+  <Package Name="MsiPackage" Language="1033" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="047730a5-30fe-4a62-a520-da9381b8226a">
+    <MajorUpgrade DowngradeErrorMessage="(DowngradeError)" />
+    <MediaTemplate EmbedCab="yes" />
+    <Feature Id="FAll">
+      <ComponentGroupRef Id="ProductComponents" />
+    </Feature>
+  </Package>
+  <Fragment>
+    <StandardDirectory Id="ProgramFilesFolder">
+      <Directory Id="INSTALLFOLDER" Name="MsiPackage" />
+    </StandardDirectory>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
+      <Component>
+        <File Name="fw.exe" Source="$(sys.SOURCEFILEPATH)">
+          <Shortcut Id="FwShortcut" Directory="INSTALLFOLDER" Name="Firewall" />
+          <fw:FirewallException Id="ExampleFirewall" Description="An app-based firewall exception" Name="ExampleApp" Port="42">
+              <fw:RemoteAddress Value="Defaultgateway" />
+              <fw:RemoteAddress Value="DHCP" />
+              <fw:RemoteAddress Value="DNS" />
+              <fw:RemoteAddress Value="255.255.255.0" />
+              <fw:RemoteAddress Value="1.1.1.1-2.2.2.2" />
+          </fw:FirewallException>
+        </File>
+        <fw:FirewallException Description="A port-based firewall exception" Name="ExamplePort" Port="42" Outbound="yes" Scope="localSubnet" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+</Wix>
diff --git a/src/ext/Firewall/wixext/FirewallDecompiler.cs b/src/ext/Firewall/wixext/FirewallDecompiler.cs
index 4fafc0a0..dbfc882e 100644
--- a/src/ext/Firewall/wixext/FirewallDecompiler.cs
+++ b/src/ext/Firewall/wixext/FirewallDecompiler.cs
@@ -4,8 +4,6 @@ namespace WixToolset.Firewall
 {
    using System;
    using System.Collections.Generic;
-    using System.Reflection;
-    using System.Security;
    using System.Xml.Linq;
    using WixToolset.Data;
    using WixToolset.Data.WindowsInstaller;
@@ -83,7 +81,7 @@ namespace WixToolset.Firewall
                    string[] addresses = ((string)row[2]).Split(',');
                    if (addresses.Length == 1)
                    {
-                        switch(addresses[0])
+                        switch (addresses[0])
                        {
                            case "*":
                                firewallException.Add(new XAttribute("Scope", "any"));
@@ -482,20 +480,25 @@ namespace WixToolset.Firewall
        /// <param name="tables">Collection of all tables.</param>
        private void FinalizeFirewallExceptionTable(TableIndexedCollection tables)
        {
-            if (tables.TryGetTable("Wix5FirewallException", out var firewallExceptionTable))
+            var possibleTableNames = new List<string>() { "WixFirewallException", "Wix4FirewallException", "Wix5FirewallException", };
+            foreach (var tableName in possibleTableNames)
            {
-                foreach (var row in firewallExceptionTable.Rows)
+                if (tables.TryGetTable(tableName, out var firewallExceptionTable))
                {
-                    var xmlConfig = this.DecompilerHelper.GetIndexedElement(row);
+                    foreach (var row in firewallExceptionTable.Rows)
-                    var componentId = row.FieldAsString(8);
-                    if (this.DecompilerHelper.TryGetIndexedElement("Component", componentId, out var component))
-                    {
-                        component.Add(xmlConfig);
-                    }
-                    else
                    {
-                        this.Messaging.Write(WarningMessages.ExpectedForeignRow(row.SourceLineNumbers, firewallExceptionTable.Name, row.GetPrimaryKey(), "Component_", componentId, "Component"));
+                        var xmlConfig = this.DecompilerHelper.GetIndexedElement(row);
+                        var componentId = row.FieldAsString(8);
+                        if (this.DecompilerHelper.TryGetIndexedElement("Component", componentId, out var component))
+                        {
+                            component.Add(xmlConfig);
+                        }
+                        else
+                        {
+                            this.Messaging.Write(WarningMessages.ExpectedForeignRow(row.SourceLineNumbers, firewallExceptionTable.Name, row.GetPrimaryKey(), "Component_", componentId, "Component"));
+                        }
                    }
                }
            }
diff --git a/src/ext/Http/README.md b/src/ext/Http/README.md
index 64cbbf51..35c80c68 100644
--- a/src/ext/Http/README.md
+++ b/src/ext/Http/README.md
@@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto
 Add the WiX Extension as a PackageReference to your .wixproj:
 ```
-<Project Sdk="WixToolset.Sdk/6.0.0">
+<Project Sdk="WixToolset.Sdk/7.0.0">
  <ItemGroup>
-    <PackageReference Include="WixToolset.Http.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.Http.wixext" Version="7.0.0" />
  </ItemGroup>
 </Project>
 ```
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/README.md b/src/ext/Iis/README.md
index 3344d10c..f9fb96c3 100644
--- a/src/ext/Iis/README.md
+++ b/src/ext/Iis/README.md
@@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto
 Add the WiX Extension as a PackageReference to your .wixproj:
 ```
-<Project Sdk="WixToolset.Sdk/6.0.0">
+<Project Sdk="WixToolset.Sdk/7.0.0">
  <ItemGroup>
-    <PackageReference Include="WixToolset.Iis.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.Iis.wixext" Version="7.0.0" />
  </ItemGroup>
 </Project>
 ```
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/README.md b/src/ext/Msmq/README.md
index 6ebd70e9..46491349 100644
--- a/src/ext/Msmq/README.md
+++ b/src/ext/Msmq/README.md
@@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto
 Add the WiX Extension as a PackageReference to your .wixproj:
 ```
-<Project Sdk="WixToolset.Sdk/6.0.0">
+<Project Sdk="WixToolset.Sdk/7.0.0">
  <ItemGroup>
-    <PackageReference Include="WixToolset.Msmq.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.Msmq.wixext" Version="7.0.0" />
  </ItemGroup>
 </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/README.md b/src/ext/NetFx/README.md
index ace02de3..dcc79786 100644
--- a/src/ext/NetFx/README.md
+++ b/src/ext/NetFx/README.md
@@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto
 Add the WiX Extension as a PackageReference to your .wixproj:
 ```
-<Project Sdk="WixToolset.Sdk/6.0.0">
+<Project Sdk="WixToolset.Sdk/7.0.0">
  <ItemGroup>
-    <PackageReference Include="WixToolset.NetFx.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.NetFx.wixext" Version="7.0.0" />
  </ItemGroup>
 </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/README.md b/src/ext/PowerShell/README.md
index 7ee2f5e2..9cea557f 100644
--- a/src/ext/PowerShell/README.md
+++ b/src/ext/PowerShell/README.md
@@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto
 Add the WiX Extension as a PackageReference to your .wixproj:
 ```
-<Project Sdk="WixToolset.Sdk/6.0.0">
+<Project Sdk="WixToolset.Sdk/7.0.0">
  <ItemGroup>
-    <PackageReference Include="WixToolset.PowerShell.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.PowerShell.wixext" Version="7.0.0" />
  </ItemGroup>
 </Project>
 ```
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/README.md b/src/ext/Sql/README.md
index adc543c8..156c7761 100644
--- a/src/ext/Sql/README.md
+++ b/src/ext/Sql/README.md
@@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto
 Add the WiX Extension as a PackageReference to your .wixproj:
 ```
-<Project Sdk="WixToolset.Sdk/6.0.0">
+<Project Sdk="WixToolset.Sdk/7.0.0">
  <ItemGroup>
-    <PackageReference Include="WixToolset.Sql.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.Sql.wixext" Version="7.0.0" />
  </ItemGroup>
 </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/README.md b/src/ext/UI/README.md
index 19d5ba0c..5b040f13 100644
--- a/src/ext/UI/README.md
+++ b/src/ext/UI/README.md
@@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto
 Add the WiX Extension as a PackageReference to your .wixproj:
 ```
-<Project Sdk="WixToolset.Sdk/6.0.0">
+<Project Sdk="WixToolset.Sdk/7.0.0">
  <ItemGroup>
-    <PackageReference Include="WixToolset.UI.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.UI.wixext" Version="7.0.0" />
  </ItemGroup>
 </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/README.md b/src/ext/Util/README.md
index 11d7a363..2bbf17ce 100644
--- a/src/ext/Util/README.md
+++ b/src/ext/Util/README.md
@@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto
 Add the WiX Extension as a PackageReference to your .wixproj:
 ```
-<Project Sdk="WixToolset.Sdk/6.0.0">
+<Project Sdk="WixToolset.Sdk/7.0.0">
  <ItemGroup>
-    <PackageReference Include="WixToolset.Util.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.Util.wixext" Version="7.0.0" />
  </ItemGroup>
 </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/Util/wixext/UtilDecompiler.cs b/src/ext/Util/wixext/UtilDecompiler.cs
index cde64f8f..fb6d02e5 100644
--- a/src/ext/Util/wixext/UtilDecompiler.cs
+++ b/src/ext/Util/wixext/UtilDecompiler.cs
@@ -538,7 +538,7 @@ namespace WixToolset.Util
                    new XAttribute("Name", Path.GetFileNameWithoutExtension(row.FieldAsString(3))), // remove .lnk/.url extension because compiler extension adds it back for us
                    new XAttribute("Type", type),
                    new XAttribute("Target", row.FieldAsString(4)),
-                    new XAttribute("IconFile", row.FieldAsString(6)),
+                    AttributeIfNotNull("IconFile", row, 6),
                    NumericAttributeIfNotNull("IconIndex", row, 7)
                    );
diff --git a/src/ext/VisualStudio/README.md b/src/ext/VisualStudio/README.md
index a418d49b..bf48670c 100644
--- a/src/ext/VisualStudio/README.md
+++ b/src/ext/VisualStudio/README.md
@@ -17,9 +17,9 @@ To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixto
 Add the WiX Extension as a PackageReference to your .wixproj:
 ```
-<Project Sdk="WixToolset.Sdk/6.0.0">
+<Project Sdk="WixToolset.Sdk/7.0.0">
  <ItemGroup>
-    <PackageReference Include="WixToolset.VisualStudio.wixext" Version="6.0.0" />
+    <PackageReference Include="WixToolset.VisualStudio.wixext" Version="7.0.0" />
  </ItemGroup>
 </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>