4 files changed, 70 insertions, 24 deletions

diff --git a/src/api/wix/WixToolset.Data/ErrorMessages.cs b/src/api/wix/WixToolset.Data/ErrorMessages.cs
index ef70ebc4..23ba5151 100644
--- a/src/api/wix/WixToolset.Data/ErrorMessages.cs
+++ b/src/api/wix/WixToolset.Data/ErrorMessages.cs
@@ -248,11 +248,6 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.DuplicateCabinetName2, "Duplicate cabinet name '{0}' error related to previous error.", cabinetName);
         }
 
-        public static Message DuplicateCommandLineOptionInExtension(string arg)
-        {
-            return Message(null, Ids.DuplicateCommandLineOptionInExtension, "The command line option '{0}' has already been loaded by another Heat extension.", arg);
-        }
-
         public static Message DuplicateComponentGuids(SourceLineNumber sourceLineNumbers, string componentId, string guid, string type, string keyPath)
         {
             return Message(sourceLineNumbers, Ids.DuplicateComponentGuids, "Component/@Id='{0}' with {2} '{3}' has a @Guid value '{1}' that duplicates another component in this package. It is recommended to give each component its own unique GUID.", componentId, guid, type, keyPath);
@@ -295,7 +290,7 @@ namespace WixToolset.Data
 
         public static Message DuplicateLocalizationIdentifier(SourceLineNumber sourceLineNumbers, string localizationId)
         {
-            return Message(sourceLineNumbers, Ids.DuplicateLocalizationIdentifier, "The localization identifier '{0}' has been duplicated in multiple locations. Please resolve the conflict.", localizationId);
+            return Message(sourceLineNumbers, Ids.DuplicateLocalizationIdentifier, "The localization identifier '{0}' has been duplicated in multiple locations. A common cause is a bundle .wixproj that automatically loads .wxl files that are intended for the bootstrapper application. You can turn off that behavior by setting the EnableDefaultEmbeddedResourceItems property to false.", localizationId);
         }
 
         public static Message DuplicateModuleCaseInsensitiveFileIdentifier(SourceLineNumber sourceLineNumbers, string moduleId, string fileId1, string fileId2)
@@ -705,16 +700,6 @@ namespace WixToolset.Data
             return Message(null, Ids.HarvestSourceNotSpecified, "A harvest source must be specified after the harvest type and can be followed by harvester arguments.");
         }
 
-        public static Message HarvestTypeNotFound()
-        {
-            return Message(null, Ids.HarvestTypeNotFound, "The harvest type was not found in the list of loaded Heat extensions.");
-        }
-
-        public static Message HarvestTypeNotFound(string harvestType)
-        {
-            return Message(null, Ids.HarvestTypeNotFound, "The harvest type '{0}' was specified. Harvest types cannot start with a '-'. Remove the '-' to specify a valid harvest type.", harvestType);
-        }
-
         public static Message IdentifierNotFound(string type, string identifier)
         {
             return Message(null, Ids.IdentifierNotFound, "An expected identifier ('{1}', of type '{0}') was not found.", type, identifier);
@@ -2588,8 +2573,6 @@ namespace WixToolset.Data
             SameFileIdDifferentSource = 317,
             HarvestSourceNotSpecified = 318,
             OutputTargetNotSpecified = 319,
-            DuplicateCommandLineOptionInExtension = 320,
-            HarvestTypeNotFound = 321,
             BothUpgradeCodesRequired = 322,
             IllegalBinderClassName = 323,
             SpecifiedBinderNotFound = 324,
diff --git a/src/api/wix/WixToolset.Data/Symbols/HarvestPayloadsSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/HarvestPayloadsSymbol.cs
new file mode 100644
index 00000000..976214dd
--- /dev/null
+++ 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(HarvestPayloadsSymbolFields.Inclusions), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HarvestPayloadsSymbolFields.Exclusions), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HarvestPayloadsSymbolFields.ComplexReferenceParentType), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(HarvestPayloadsSymbolFields.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
index 64f51162..64c1a2a5 100644
--- a/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs
@@ -41,6 +41,7 @@ namespace WixToolset.Data
         File,
         FileSFPCatalog,
         HarvestFiles,
+        HarvestPayloads,
         Icon,
         ImageFamilies,
         IniFile,
diff --git a/src/api/wix/WixToolset.Data/WarningMessages.cs b/src/api/wix/WixToolset.Data/WarningMessages.cs
index 15068a90..83d9dc51 100644
--- a/src/api/wix/WixToolset.Data/WarningMessages.cs
+++ b/src/api/wix/WixToolset.Data/WarningMessages.cs
@@ -357,11 +357,6 @@ namespace WixToolset.Data
             return Message(null, Ids.ImplicitMergeModulePrimaryFeature, "The merge module '{0}' does not have an explicit primary feature parent specified. If the source files are linked in a different order, the primary parent feature may change. To prevent accidental changes, the primary feature parent should be set to 'yes' in one of the MergeRef/@Primary or FeatureGroupRef/@Primary locations for this component.", componentId);
         }
 
-        public static Message InsufficientPermissionHarvestTypeLib()
-        {
-            return Message(null, Ids.InsufficientPermissionHarvestTypeLib, "Not enough permissions to harvest type library. On Windows Vista, you must either run Heat elevated, or install Windows Vista SP1 (or higher).");
-        }
-
         public static Message InvalidAttributeCombination(SourceLineNumber sourceLineNumbers, string attrib1, string attrib2, string name, string value)
         {
             return Message(sourceLineNumbers, Ids.InvalidAttributeCombination, "It is invalid to combine attributes {0} and {1}. The decompiled output will set attribute {2} to {3}.", attrib1, attrib2, name, value);
@@ -813,7 +808,6 @@ namespace WixToolset.Data
             UnexpectedEntrySection = 1109,
             NewComponentAddedToExistingFeature = 1110,
             DeprecatedAttributeValue = 1111,
-            InsufficientPermissionHarvestTypeLib = 1112,
             UnclearShortcut = 1113,
             TooManyProgIds = 1114,
             BadColumnDataIgnored = 1115,