wixtoolset · barnson · Jun 12, 2025 · Apr 27, 2025 · Jun 12, 2025
diff --git a/src/api/wix/WixToolset.Data/Symbols/HarvestPayloadsSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/HarvestPayloadsSymbol.cs
@@ -0,0 +1,68 @@
+// 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.
+
+namespace WixToolset.Data
+{
+    using WixToolset.Data.Symbols;
+
+    public static partial class SymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition HarvestPayloads = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.HarvestPayloads,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(HarvestFilesSymbolFields.Inclusions), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HarvestFilesSymbolFields.Exclusions), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HarvestFilesSymbolFields.ComplexReferenceParentType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HarvestFilesSymbolFields.ParentId), IntermediateFieldType.String),
+            },
+            typeof(HarvestPayloadsSymbol));
+    }
+}
+
+namespace WixToolset.Data.Symbols
+{
+    public enum HarvestPayloadsSymbolFields
+    {
+        Inclusions,
+        Exclusions,
+        ComplexReferenceParentType,
+        ParentId,
+    }
+
+    public class HarvestPayloadsSymbol : IntermediateSymbol
+    {
+        public HarvestPayloadsSymbol() : base(SymbolDefinitions.HarvestPayloads, null, null)
+        {
+        }
+
+        public HarvestPayloadsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.HarvestPayloads, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[HarvestPayloadsSymbolFields index] => this.Fields[(int)index];
+
+        public string Inclusions
+        {
+            get => (string)this.Fields[(int)HarvestPayloadsSymbolFields.Inclusions];
+            set => this.Set((int)HarvestPayloadsSymbolFields.Inclusions, value);
+        }
+
+        public string Exclusions
+        {
+            get => (string)this.Fields[(int)HarvestPayloadsSymbolFields.Exclusions];
+            set => this.Set((int)HarvestPayloadsSymbolFields.Exclusions, value);
+        }
+
+        public string ComplexReferenceParentType
+        {
+            get => (string)this.Fields[(int)HarvestPayloadsSymbolFields.ComplexReferenceParentType];
+            set => this.Set((int)HarvestPayloadsSymbolFields.ComplexReferenceParentType, value);
+        }
+
+        public string ParentId
+        {
+            get => (string)this.Fields[(int)HarvestPayloadsSymbolFields.ParentId];
+            set => this.Set((int)HarvestPayloadsSymbolFields.ParentId, value);
+        }
+    }
+}
diff --git a/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs b/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs
@@ -41,6 +41,7 @@ public enum SymbolDefinitionType
         File,
         FileSFPCatalog,
         HarvestFiles,
+        HarvestPayloads,
         Icon,
         ImageFamilies,
         IniFile,

diff --git 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
@@ -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
diff --git 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
@@ -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
diff --git 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
@@ -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
diff --git 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
@@ -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
diff --git 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>