1 files changed, 35 insertions, 0 deletions

diff --git a/src/tools/heat/UtilFinalizeHarvesterMutator.cs b/src/tools/heat/UtilFinalizeHarvesterMutator.cs
index 61bb8731..d41d6e1e 100644
--- a/src/tools/heat/UtilFinalizeHarvesterMutator.cs
+++ b/src/tools/heat/UtilFinalizeHarvesterMutator.cs
@@ -25,6 +25,7 @@ namespace WixToolset.Harvesters
         private Hashtable filePaths;
         private ArrayList files;
         private ArrayList registryValues;
+        private List<Wix.Payload> payloads;
         private bool suppressCOMElements;
         private bool suppressVB6COMElements;
         private string preprocessorVariable;
@@ -40,6 +41,7 @@ namespace WixToolset.Harvesters
             this.filePaths = new Hashtable();
             this.files = new ArrayList();
             this.registryValues = new ArrayList();
+            this.payloads = new List<Wix.Payload>();
         }
 
         /// <summary>
@@ -93,6 +95,7 @@ namespace WixToolset.Harvesters
             this.filePaths.Clear();
             this.files.Clear();
             this.registryValues.Clear();
+            this.payloads.Clear();
 
             // index elements in this wix document
             this.IndexElement(wix);
@@ -100,6 +103,7 @@ namespace WixToolset.Harvesters
             this.MutateDirectories();
             this.MutateFiles();
             this.MutateRegistryValues();
+            this.MutatePayloads();
 
             // must occur after all the registry values have been formatted
             this.MutateComponents();
@@ -131,6 +135,10 @@ namespace WixToolset.Harvesters
             {
                 this.registryValues.Add(element);
             }
+            else if (element is Wix.Payload payloadElement)
+            {
+                this.payloads.Add(payloadElement);
+            }
 
             // index the child elements
             if (element is Wix.IParentElement)
@@ -1006,6 +1014,33 @@ namespace WixToolset.Harvesters
         }
 
         /// <summary>
+        /// Mutate the payloads.
+        /// </summary>
+        private void MutatePayloads()
+        {
+            string sourceDirSubstitution = this.preprocessorVariable;
+            if (sourceDirSubstitution == null)
+            {
+                return;
+            }
+
+            string prefix = "$(";
+            if (sourceDirSubstitution.StartsWith("wix.", StringComparison.Ordinal))
+            {
+                prefix = "!(";
+            }
+            sourceDirSubstitution = String.Concat(prefix, sourceDirSubstitution, ")");
+
+            foreach (var payload in this.payloads)
+            {
+                if (payload.SourceFile != null && payload.SourceFile.StartsWith("SourceDir\\", StringComparison.Ordinal))
+                {
+                    payload.SourceFile = payload.SourceFile.Substring(9).Insert(0, sourceDirSubstitution);
+                }
+            }
+        }
+
+        /// <summary>
         /// Mutate an individual registry string, according to a collection of replacement items.
         /// </summary>
         /// <param name="value">The string to mutate.</param>