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
---
 src/test/burn/TestData/Manual/BundleB/Bundle.wxs    |  4 ++--
 .../burn/TestData/Manual/BundleB/BundleB.wixproj    | 14 --------------
 src/test/burn/TestData/Manual/BundleB/BundleB.wxs   |  2 +-
 src/test/burn/TestData/Manual/BundleB/ba.xslt       | 21 ---------------------
 src/test/burn/TestData/Manual/BundleB/package.xslt  | 21 ---------------------
 5 files changed, 3 insertions(+), 59 deletions(-)
 delete mode 100644 src/test/burn/TestData/Manual/BundleB/ba.xslt
 delete mode 100644 src/test/burn/TestData/Manual/BundleB/package.xslt

(limited to 'src/test')

diff --git a/src/test/burn/TestData/Manual/BundleB/Bundle.wxs b/src/test/burn/TestData/Manual/BundleB/Bundle.wxs
index 8c670577..248ec05c 100644
--- a/src/test/burn/TestData/Manual/BundleB/Bundle.wxs
+++ b/src/test/burn/TestData/Manual/BundleB/Bundle.wxs
@@ -30,11 +30,11 @@
     <?elseif $(var.BA) = "hyperlinkLicense"?>
       <BootstrapperApplication>
         <bal:WixStandardBootstrapperApplication LicenseUrl="" Theme="hyperlinkLicense" />
-        <PayloadGroupRef Id="BAPayloads" />
+        <Payloads Include="$(sys.SOURCEFILEDIR)\BAPayloads\**" />
       </BootstrapperApplication>
     <?else?>
       <BootstrapperApplicationRef Id="$(var.BA)">
-        <PayloadGroupRef Id="BAPayloads" />
+        <Payloads Include="$(sys.SOURCEFILEDIR)\BAPayloads\**" />
       </BootstrapperApplicationRef>
     <?endif?>
 
diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
index 36792c2b..d0b05bc1 100644
--- a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
+++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj
@@ -7,25 +7,11 @@
     <HarvestDirectoryAdditionalOptions>-generate payloadgroup -sw5149</HarvestDirectoryAdditionalOptions>
   </PropertyGroup>
 
-  <ItemGroup>
-    <HarvestDirectory Include="BAPayloads">
-      <ComponentGroupName>BAPayloads</ComponentGroupName>
-      <DirectoryRefId>BAPayloads</DirectoryRefId>
-      <Transforms>ba.xslt</Transforms>
-    </HarvestDirectory>
-    <HarvestDirectory Include="PackagePayloads">
-      <ComponentGroupName>PackagePayloads</ComponentGroupName>
-      <DirectoryRefId>PackagePayloads</DirectoryRefId>
-      <Transforms>package.xslt</Transforms>
-    </HarvestDirectory>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\PackageA\PackageA.wixproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WixToolset.Heat" />
     <PackageReference Include="WixToolset.BootstrapperApplications.wixext" />
   </ItemGroup>
 
diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wxs b/src/test/burn/TestData/Manual/BundleB/BundleB.wxs
index 54082131..f1a04445 100644
--- a/src/test/burn/TestData/Manual/BundleB/BundleB.wxs
+++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wxs
@@ -4,7 +4,7 @@
   <Fragment>
     <PackageGroup Id="BundlePackages">
       <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)">
-        <PayloadGroupRef Id="PackagePayloads" />
+        <Payloads Include="$(sys.SOURCEFILEDIR)\PackagePayloads\**" />
       </MsiPackage>
     </PackageGroup>
   </Fragment>
diff --git a/src/test/burn/TestData/Manual/BundleB/ba.xslt b/src/test/burn/TestData/Manual/BundleB/ba.xslt
deleted file mode 100644
index 54bc7fe6..00000000
--- a/src/test/burn/TestData/Manual/BundleB/ba.xslt
+++ /dev/null
@@ -1,21 +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" >
-        <xsl:copy>
-            <xsl:apply-templates select="@* | node()"/>
-            <xsl:attribute name="Id">ba_<xsl:value-of select="substring(@SourceFile, 11)" /></xsl:attribute>
-            <xsl:attribute name="SourceFile">BAPayloads<xsl:value-of select="substring(@SourceFile, 10)" /></xsl:attribute>
-        </xsl:copy>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/src/test/burn/TestData/Manual/BundleB/package.xslt b/src/test/burn/TestData/Manual/BundleB/package.xslt
deleted file mode 100644
index 304ff78b..00000000
--- a/src/test/burn/TestData/Manual/BundleB/package.xslt
+++ /dev/null
@@ -1,21 +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" >
-        <xsl:copy>
-            <xsl:apply-templates select="@* | node()"/>
-            <xsl:attribute name="Id">package_<xsl:value-of select="substring(@SourceFile, 11)" /></xsl:attribute>
-            <xsl:attribute name="SourceFile">PackagePayloads<xsl:value-of select="substring(@SourceFile, 10)" /></xsl:attribute>
-        </xsl:copy>
-    </xsl:template>
-</xsl:stylesheet>
-- 
cgit v1.2.3-55-g6feb