20 files changed, 126 insertions, 131 deletions

diff --git a/src/ext/Bal/README.md b/src/ext/Bal/README.md
index 4a14b1a2..009615dd 100644
--- a/src/ext/Bal/README.md
+++ b/src/ext/Bal/README.md
@@ -1,2 +1,58 @@
-# WixToolset.BootstrapperApplications.wixext
-WixToolset.BootstrapperApplications.wixext - Bootstrapper Applications WiX Toolset Extension
+# WixToolset.BootstrapperApplications.wixext - Bootstrapper Applications WiX Toolset Extension
+
+This WiX Extension provides the standard BootstrapperApplications provided by the WiX Toolset.
+
+- WixStdBA ([WixStandardBootstrapperApplication](https://docs.firegiant.com/wix/schema/bal/wixstandardbootstrapperapplication/)), a bootstrapper application with support for custom themes
+- WixIuiBA ([WixInternalUIBootstrapperApplication](https://docs.firegiant.com/wix/schema/bal/wixinternaluibootstrapperapplication/)), a bootstrapper application for showing internal UI of Windows Installer packages
+- WixPreqBA ([WixPrerequisiteBootstrapperApplication](https://docs.firegiant.com/wix/schema/bal/wixprerequisitebootstrapperapplication/)), a secondary bootstrapper application for bootstrapping the prerequisites needed for a primary bootstrapper application
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
+
+Add the WiX Extension as a PackageReference to your .wixproj:
+
+```
+<Project Sdk="WixToolset.Sdk/7.0.0">
+  <ItemGroup>
+    <PackageReference Include="WixToolset.BootstrapperApplications.wixext" Version="7.0.0" />
+  </ItemGroup>
+</Project>
+```
+
+Then add the namespace and bootstrapper application of choice:
+
+```
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle BundleId="AcmeCorp.Example" Name="Example Bundle" Version="0.0.0.1" Manufacturer="ACME Corporation">
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
+    </BootstrapperApplication>
+  </Bundle>
+</Wix>
+```
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
+
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
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" />
-        <HarvestDirectory Include="$(OutputPath)publish\Example.EarliestCoreMBA\scd">
-            <DirectoryRefId>publish.Example.EarliestCoreMBA.scd</DirectoryRefId>
-            <Transforms>ba.xslt</Transforms>
-        </HarvestDirectory>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="WixToolset.Heat" />
+        <BindPath Include="$(OutputPath)publish\Example.EarliestCoreMBA\scd" BindName="ba.payloads" />
     </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">
-            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> -->
-            <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.scd" />
+        <BootstrapperApplication SourceFile="!(bindpath.ba.payloads)\Example.EarliestCoreMBA.exe">
+            <Payloads Include="!(bindpath.ba.payloads)\**">
+              <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" />
-        <HarvestDirectory Include="$(OutputPath)publish\Example.EarliestCoreMBA\trimmedscd">
-            <DirectoryRefId>publish.Example.EarliestCoreMBA.trimmedscd</DirectoryRefId>
-            <Transforms>ba.xslt</Transforms>
-        </HarvestDirectory>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="WixToolset.Heat" />
+        <BindInputPaths Include="$(OutputPath)publish\Example.EarliestCoreMBA\trimmedscd" BindName="ba.payloads" />
     </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" >
-            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> -->
-            <PayloadGroupRef Id="publish.Example.EarliestCoreMBA.trimmedscd" />
+        <BootstrapperApplication SourceFile="!(bindpath.ba.payloads)\Example.EarliestCoreMBA.exe" >
+            <Payloads Include="!(bindpath.ba.payloads)\**">
+              <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" />
-        <HarvestDirectory Include="$(OutputPath)publish\Example.LatestCoreMBA\scd">
-            <DirectoryRefId>publish.Example.LatestCoreMBA.scd</DirectoryRefId>
-            <Transforms>ba.xslt</Transforms>
-        </HarvestDirectory>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="WixToolset.Heat" />
+        <BindInputPaths Include="$(OutputPath)publish\Example.LatestCoreMBA\scd" BindName="ba.payloads" />
     </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">
-            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> -->
-            <PayloadGroupRef Id="publish.Example.LatestCoreMBA.scd" />
+        <BootstrapperApplication SourceFile="!(bindpath.ba.payloads)\Example.LatestCoreMBA.exe">
+            <Payloads Include="!(bindpath.ba.payloads)\**">
+              <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" />
-        <HarvestDirectory Include="$(OutputPath)publish\Example.LatestCoreMBA\trimmedscd">
-            <DirectoryRefId>publish.Example.LatestCoreMBA.trimmedscd</DirectoryRefId>
-            <Transforms>ba.xslt</Transforms>
-        </HarvestDirectory>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="WixToolset.Heat" />
+        <BindInputPaths Include="$(OutputPath)publish\Example.LatestCoreMBA\trimmedscd" BindName="ba.payloads" />
     </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">
-            <!-- <bal:WixDotNetCoreBootstrapperApplicationHost SelfContainedDeployment="yes" /> -->
-            <PayloadGroupRef Id="publish.Example.LatestCoreMBA.trimmedscd" />
+        <BootstrapperApplication SourceFile="!(bindpath.ba.payloads)\Example.LatestCoreMBA.exe">
+            <Payloads Include="!(bindpath.ba.payloads)\**">
+              <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/Bal/wixext/README.md b/src/ext/Bal/wixext/README.md
deleted file mode 100644
index a986cb0e..00000000
--- a/src/ext/Bal/wixext/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# WixToolset.BootstrapperApplications
-
-WixToolset.BootstrapperApplications is a WiX extension that provides the WiX bootstrapper applications:
-
-- WixStdBA ([WixStandardBootstrapperApplication](https://wixtoolset.org/docs/schema/bal/wixstandardbootstrapperapplication/)), a bootstrapper application with support for custom themes
-- WixIuiBA ([WixInternalUIBootstrapperApplication](https://wixtoolset.org/docs/schema/bal/wixinternaluibootstrapperapplication/)), a bootstrapper application for showing internal UI of Windows Installer packages
-- WixPreqBA ([WixPrerequisiteBootstrapperApplication](https://wixtoolset.org/docs/schema/bal/wixprerequisitebootstrapperapplication/)), a secondary bootstrapper application for bootstrapping the prerequisites needed for a primary bootstrapper application
diff --git a/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj b/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj
index de32ff4d..adc6a86f 100644
--- a/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj
+++ b/src/ext/Bal/wixext/WixToolset.BootstrapperApplications.wixext.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="README.md" Pack="true" PackagePath="\" />
+    <None Include="..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(NCrunch)'=='' ">
diff --git a/src/ext/Bal/wixstdfn/README.md b/src/ext/Bal/wixstdfn/README.md
index 0977ff42..4aef768e 100644
--- a/src/ext/Bal/wixstdfn/README.md
+++ b/src/ext/Bal/wixstdfn/README.md
@@ -1,11 +1,37 @@
-# WixToolset.WixStandardBootstrapperApplicationFunctionApi
+# WixToolset.WixStandardBootstrapperApplicationFunctionApi - extend WiX Standard Bootstrapper Application
 
-WixToolset.WixStandardBootstrapperApplicationFunctionApi contains the SDK for building **BAFunctions** extensions for WixStdBA, the WiX Standard Bootstrapper Application for Burn bootstrapper bundles.
+The `WixToolset.WixStandardBootstrapperApplicationFunctionApi` package contains the SDK for building **BAFunctions** extensions for WixStdBA, the WiX Standard Bootstrapper Application for Burn bootstrapper bundles.
+
+[Web Site][web] | [Documentation][docs] | [Issue Tracker][issues] | [Discussions][discussions]
+
+
+## Open Source Maintenance Fee
+
+To ensure the long-term sustainability of this project, users of this package who generate revenue must pay an [Open Source Maintenance Fee][osmf]. While the source code is freely available under the terms of the [LICENSE][license], this package and other aspects of the project require [adherence to the Open Source Maintenance Fee EULA][eula].
+
+To pay the Maintenance Fee, [become a Sponsor](https://github.com/sponsors/wixtoolset).
+
+
+## Getting started
 
 BAFunctions are native-code DLLs (typically written in C++) that let you supplement the behavior of WixStdBA, rather than writing an entirely new BA to tweak existing BA behavior.
 
-## Sources
-https://github.com/wixtoolset/wix/tree/HEAD/src/ext/Bal/wixstdfn
+The best way to learn is via the samples at: https://github.com/wixtoolset/wix/tree/HEAD/src/ext/Bal/Samples/bafunctions
+
+
+## Additional resources
+
+* [WiX Website][web]
+* [WiX Documentation][docs]
+* [WiX Issue Tracker][issues]
+* [WiX Discussions][discussions]
+
 
-## Samples
-https://github.com/wixtoolset/wix/tree/HEAD/src/ext/Bal/Samples/bafunctions
+[web]: https://www.firegiant.com/wixtoolset/
+[docs]: https://docs.firegiant.com/wixtoolset/
+[issues]: https://github.com/wixtoolset/issues/issues
+[discussions]: https://github.com/orgs/wixtoolset/discussions
+[sdk]: https://www.nuget.org/packages/WixToolset.Sdk/
+[osmf]: https://opensourcemaintenancefee.org/
+[license]: https://github.com/wixtoolset/wix/blob/main/LICENSE.TXT
+[eula]: https://github.com/wixtoolset/wix/blob/main/OSMFEULA.txt
diff --git a/src/ext/Bal/wixstdfn/wixstdfn.nuspec b/src/ext/Bal/wixstdfn/wixstdfn.nuspec
index 86860b67..d4b6e104 100644
--- a/src/ext/Bal/wixstdfn/wixstdfn.nuspec
+++ b/src/ext/Bal/wixstdfn/wixstdfn.nuspec
@@ -7,13 +7,13 @@
     <description>$description$</description>
     <authors>$authors$</authors>
     <icon>icon.png</icon>
+    <readme>README.md</readme>
     <license type="file">OSMFEULA.txt</license>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <tags>$packageTags$</tags>
     <copyright>$copyright$</copyright>
     <projectUrl>$projectUrl$</projectUrl>
     <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
-    <readme>README.md</readme>
     <dependencies>
       <group targetFramework="Native">
         <dependency id="WixToolset.BootstrapperApplicationApi" version="[$version$,$nextmajorversion$)" />