From 7051e6a5fdc8965289fbc34d0de2a78dae14e62e Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Sun, 27 Apr 2025 11:21:34 -0400
Subject: Add `Payloads` element to harvest bundle payloads.

Implements https://github.com/wixtoolset/issues/issues/9049
---
 .../LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj       | 10 +---------
 .../examples/LatestCoreBundleSCD/SelfContainedBundle.wxs  |  8 +++++---
 src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt     | 15 ---------------
 3 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt

(limited to 'src/ext/Bal/test/examples/LatestCoreBundleSCD')

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>
-- 
cgit v1.2.3-55-g6feb