47 files changed, 718 insertions, 838 deletions
diff --git a/src/api/wix/WixToolset.Data/WarningMessages.cs b/src/api/wix/WixToolset.Data/WarningMessages.cs
index 67915620..8391da90 100644
--- a/src/api/wix/WixToolset.Data/WarningMessages.cs
+++ b/src/api/wix/WixToolset.Data/WarningMessages.cs
@@ -3,100 +3,9 @@
 namespace WixToolset.Data
 {
    using System;
-    using System.Resources;
    public static class WarningMessages
    {
-        public static Message AccessDeniedForDeletion(SourceLineNumber sourceLineNumbers, string tempFilesBasePath)
-        {
-            return Message(sourceLineNumbers, Ids.AccessDeniedForDeletion, "Access denied; cannot delete '{0}'.", tempFilesBasePath);
-        }
-        public static Message AccessDeniedForSettingAttributes(SourceLineNumber sourceLineNumbers, string filePath)
-        {
-            return Message(sourceLineNumbers, Ids.AccessDeniedForSettingAttributes, "Access denied; cannot set attributes on '{0}'.", filePath);
-        }
-        public static Message ActionSequenceCollision(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName1, string actionName2, int sequenceNumber)
-        {
-            return Message(sourceLineNumbers, Ids.ActionSequenceCollision, "The {0} table contains actions '{1}' and '{2}' which both have the same sequence number {3}. Please change the sequence number for one of these actions to avoid an ICE warning.", sequenceTableName, actionName1, actionName2, sequenceNumber);
-        }
-        public static Message ActionSequenceCollision2(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.ActionSequenceCollision2, "The location of the action related to previous warning.");
-        }
-        public static Message AllChangesIncludedInPatch(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.AllChangesIncludedInPatch, "All changes between the baseline and upgraded packages will be included in the patch except for any change to the ProductCode. The 'All' element is supported primarily for testing purposes and negates the benefits of patch families.");
-        }
-        public static Message AmbiguousFileOrDirectoryName(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.AmbiguousFileOrDirectoryName, "The {0}/@{1} attribute's value '{2}' is an ambiguous short name because it ends with a '~' character followed by a number. Under some circumstances, this name could resolve to more than one file or directory name and lead to unpredictable results (for example 'MICROS~1' may correspond to 'Microsoft Shared' or 'Microsoft Foo' or literally 'Micros~1').", elementName, attributeName, value);
-        }
-        public static Message AttributeShouldContain(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue, string expectedContains, string otherAttributeName, string otherAttributeValue)
-        {
-            return Message(sourceLineNumbers, Ids.AttributeShouldContain, "The {0}/@{1} attribute value '{2}' should contain '{3}' when the {0}/@{4} attribute is set to '{5}'.", elementName, attributeName, attributeValue, expectedContains, otherAttributeName, otherAttributeValue);
-        }
-        public static Message BackslashTerminateInlineDirectorySyntax(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.BackslashTerminateInlineDirectorySyntax, "Backslash terminate the {0}/@{1} attribute's inline directory value '{2}'. A backslash ensures a directory name will not be mistaken for a directory reference.", elementName, attributeName, value);
-        }
-        public static Message BadColumnDataIgnored(SourceLineNumber sourceLineNumbers, string value, string tableName, string columnName)
-        {
-            return Message(sourceLineNumbers, Ids.BadColumnDataIgnored, "The value '{0}' in table '{1}', column '{2}' is invalid according to the column's validation information. The decompiled output includes a best-effort representation of this value.", value, tableName, columnName);
-        }
-        public static Message CannotUpdateCabCache(SourceLineNumber sourceLineNumbers, string cabinetPath, string detail)
-        {
-            return Message(sourceLineNumbers, Ids.CannotUpdateCabCache, "Cannot update the timestamp of cached cabinet: '{0}'. If the timestamp is not updated, the build may rebuild more than is necessary. To fix the issue, ensure that the cabinet file is writable, error: {1}", cabinetPath, detail);
-        }
-        public static Message ColumnsIncompatibleWithInstallerVersion(SourceLineNumber sourceLineNumbers, string tableName, int packageInstallerVersion)
-        {
-            return Message(sourceLineNumbers, Ids.ColumnsIncompatibleWithInstallerVersion, "Table '{0}' uses columns that require a version of Windows Installer greater than specified in your package ('{1}').", tableName, packageInstallerVersion);
-        }
-        public static Message CopyFileFileIdUseless(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.CopyFileFileIdUseless, "Since the CopyFile/@FileId attribute was specified but none of the following attributes (DestinationName, DestinationDirectory, DestinationProperty) were specified, this authoring will not do anything.");
-        }
-        public static Message DangerousTableInMergeModule(SourceLineNumber sourceLineNumbers, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.DangerousTableInMergeModule, "Merge modules should not contain the '{0}' table because all merge conflicts cannot avoided. However, this warning can be suppressed if all of the consumers of the Merge Module agree to not duplicate identifiers in the '{0}' table.", tableName);
-        }
-        public static Message DecompiledStandardActionRelativelyScheduledInModule(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
-        {
-            return Message(sourceLineNumbers, Ids.DecompiledStandardActionRelativelyScheduledInModule, "The {0} table contains a standard action '{1}' that does not have a sequence number specified. A value in the Sequence column is required for standard actions in a merge module. Remove the action from the decompiled authoring to have WiX automatically sequence it.", sequenceTableName, actionName);
-        }
-        public static Message DecompilingAsCustomTable(SourceLineNumber sourceLineNumbers, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.DecompilingAsCustomTable, "The {0} table is being decompiled as a custom table.", tableName);
-        }
-        public static Message DefaultLanguageUsedForUnversionedFile(SourceLineNumber sourceLineNumbers, string language, string fileId)
-        {
-            return Message(sourceLineNumbers, Ids.DefaultLanguageUsedForUnversionedFile, "The DefaultLanguage '{0}' was used for file '{1}' which has no language or version. For unversioned files, specifying a value for DefaultLanguage is not neccessary and it will not be used when determining file versions. Remove the DefaultLanguage attribute to eliminate this warning.", language, fileId);
-        }
-        public static Message DefaultLanguageUsedForVersionedFile(SourceLineNumber sourceLineNumbers, string language, string fileId)
-        {
-            return Message(sourceLineNumbers, Ids.DefaultLanguageUsedForVersionedFile, "The DefaultLanguage '{0}' was used for file '{1}' which has no language. Specifying a language that is different from the actual file may result in unexpected versioning behavior during a repair or while patching. Either specify a value for DefaultLanguage or put the language in the version information resource to eliminate this warning.", language, fileId);
-        }
-        public static Message DefaultVersionUsedForUnversionedFile(SourceLineNumber sourceLineNumbers, string version, string fileId)
-        {
-            return Message(sourceLineNumbers, Ids.DefaultVersionUsedForUnversionedFile, "The DefaultVersion '{0}' was used for file '{1}' which has no version. No entry for this file will be placed in the MsiFileHash table. For unversioned files, specifying a version that is different from the actual file may result in unexpected versioning behavior during a repair or while patching. Version the resource to eliminate this warning.", version, fileId);
-        }
        public static Message DeprecatedAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
        {
            return Message(sourceLineNumbers, Ids.DeprecatedAttribute, "The {0}/@{1} attribute has been deprecated.", elementName, attributeName);
@@ -122,21 +31,6 @@ namespace WixToolset.Data
            return Message(sourceLineNumbers, Ids.DeprecatedAttributeValue, "The value \"{0}\" for the {1}/@{2} attribute has been deprecated. Please use \"{3}\" instead.", attributeValue, elementName, attributeName, newAttributeValue);
        }
-        public static Message DeprecatedCommandLineSwitch(string oldSwitch)
-        {
-            return Message(null, Ids.DeprecatedCommandLineSwitch, "The command line switch '{0}' is deprecated.", oldSwitch);
-        }
-        public static Message DeprecatedCommandLineSwitch(string oldSwitch, string newSwitch)
-        {
-            return Message(null, Ids.DeprecatedCommandLineSwitch, "The command line switch '{0}' is deprecated. Please use '{1}' instead.", oldSwitch, newSwitch);
-        }
-        public static Message DeprecatedComponentGroupId(SourceLineNumber sourceLineNumbers, string elementName)
-        {
-            return Message(sourceLineNumbers, Ids.DeprecatedComponentGroupId, "The {0}/@Id attribute contains invalid characters for an identifier. Being able to use invalid identifier characters for a {0} identifier has been deprecated.", elementName);
-        }
        public static Message DeprecatedElement(SourceLineNumber sourceLineNumbers, string elementName)
        {
            return Message(sourceLineNumbers, Ids.DeprecatedElement, "The {0} element has been deprecated.", elementName);
@@ -152,126 +46,6 @@ namespace WixToolset.Data
            return Message(sourceLineNumbers, Ids.DeprecatedElement, "The {0} element has been deprecated. Please use the {1} or {2} element instead.", elementName, newElementName1, newElementName2);
        }
-        public static Message DeprecatedIgnoreModularizationElement(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.DeprecatedIgnoreModularizationElement, "The IgnoreModularization element has been deprecated. Use the Binary/@SuppressModularization, CustomAction/@SuppressModularization, or Property/@SuppressModularization attribute instead.");
-        }
-        public static Message DeprecatedLocalizationVariablePrefix(SourceLineNumber sourceLineNumbers, string variableId)
-        {
-            return Message(sourceLineNumbers, Ids.DeprecatedLocalizationVariablePrefix, "The localization variable $(loc.{0}) uses a deprecated prefix '$'. Please use the '!' prefix instead. Since the prefix '$' is also used by the preprocessor, it has been deprecated to avoid namespace collisions.", variableId);
-        }
-        public static Message DeprecatedLongNameAttribute(SourceLineNumber sourceLineNumbers, string elementName, string longNameAttributeName, string nameAttributeName, string shortNameAttributeName)
-        {
-            return Message(sourceLineNumbers, Ids.DeprecatedLongNameAttribute, "The {0}/@{1} attribute has been deprecated. Since WiX now has the ability to generate short file/directory names, the desired name should be specified in the {2} attribute instead. If the name specified in the {2} attribute is a short name, then WiX will not generate a short name. If the name specified in the {2} attribute is a long name and you want to manually specify the short name, please set the short name value in the {3} attribute.", elementName, longNameAttributeName, nameAttributeName, shortNameAttributeName);
-        }
-        public static Message DeprecatedPreProcVariable(SourceLineNumber sourceLineNumbers, string oldName, string newName)
-        {
-            return Message(sourceLineNumbers, Ids.DeprecatedPreProcVariable, "The built-in preprocessor variable '{0}' is deprecated. Please correct your authoring to use the new '{1}' preprocessor variable instead.", oldName, newName);
-        }
-        public static Message DeprecatedQuestionMarksGuid(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
-        {
-            return Message(sourceLineNumbers, Ids.DeprecatedQuestionMarksGuid, "The {0}/@{1} attribute's value '????????-????-????-????-????????????' has been deprecated. Use '*' instead.", elementName, attributeName);
-        }
-        public static Message DeprecatedRegistryElement(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.DeprecatedRegistryElement, "The Registry element has been deprecated. Please use one of the new elements which replaces its functionality: RegistryKey for creating registry keys, RegistryValue for writing registry values, RemoveRegistryKey for removing registry keys, and RemoveRegistryValue for removing registry values.");
-        }
-        public static Message DeprecatedRegistryKeyActionAttribute(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.DeprecatedRegistryKeyActionAttribute, "The RegistryKey/@Action attribute has been deprecated. In most cases, you can simply omit @Action. If you need to force Windows Installer to create an empty key or recursively delete the key, use the ForceCreateOnInstall or ForceDeleteOnUninstall attributes instead.");
-        }
-        public static Message DeprecatedTable(string tableName)
-        {
-            return Message(null, Ids.DeprecatedTable, "The {0} table is not supported by the WiX toolset because it has been deprecated by the Windows Installer team. Any information in this table will be left out of the decompiled output.", tableName);
-        }
-        public static Message DeprecatedUpgradeProperty(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.DeprecatedUpgradeProperty, "Specifying a Property element as a child of an Upgrade element has been deprecated. Please specify this Property element as a child of a different element such as Package or Fragment.");
-        }
-        public static Message DirectoryInUse(SourceLineNumber sourceLineNumbers, string filePath)
-        {
-            return Message(sourceLineNumbers, Ids.DirectoryInUse, "The directory '{0}' is in use and cannot be deleted.", filePath);
-        }
-        public static Message DirectoryRedundantNames(SourceLineNumber sourceLineNumbers, string elementName, string shortNameAttributeName, string longNameAttributeName, string attributeValue)
-        {
-            return Message(sourceLineNumbers, Ids.DirectoryRedundantNames, "The {0} element's {1} and {2} values are both '{3}'. This is redundant; the {2} attribute should be removed.", elementName, shortNameAttributeName, longNameAttributeName, attributeValue);
-        }
-        public static Message DirectoryRedundantNames(SourceLineNumber sourceLineNumbers, string elementName, string sourceNameAttributeName, string longSourceAttributeName)
-        {
-            return Message(sourceLineNumbers, Ids.DirectoryRedundantNames, "The {0} element's source and destination names are identical. This is redundant; the {1} and {2} attributes should be removed if present.", elementName, sourceNameAttributeName, longSourceAttributeName);
-        }
-        public static Message DiscardedRollbackBoundary(SourceLineNumber sourceLineNumbers, string rollbackBoundaryId)
-        {
-            return Message(sourceLineNumbers, Ids.DiscardedRollbackBoundary, "The RollbackBoundary '{0}' was discarded because it was not followed by a package. Without a package the rollback boundary doesn't do anything. Verify that the RollbackBoundary element is not followed by another RollbackBoundary and that the element is not at the end of the chain.", rollbackBoundaryId);
-        }
-        public static Message DiscardedRollbackBoundary2(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.DiscardedRollbackBoundary2, "Location of rollback boundary related to previous warning.");
-        }
-        public static Message DiscouragedAllUsersValue(SourceLineNumber sourceLineNumbers, string path, string machineOrUser)
-        {
-            return Message(sourceLineNumbers, Ids.DiscouragedAllUsersValue, "Bundles require a package to be either per-machine or per-user. The MSI '{0}' ALLUSERS Property is set to '2' which may change from per-user to per-machine at install time. The Bundle will assume the package is per-{1} and will not work correctly if that changes. If possible, use the Package/@Scope attribute values 'perUser' or 'perMachine' instead.", path, machineOrUser);
-        }
-        public static Message DetectConditionRecommended(SourceLineNumber sourceLineNumbers, string elementName)
-        {
-            return Message(sourceLineNumbers, Ids.DetectConditionRecommended, "The {0}/@DetectCondition attribute is recommended so the package is only installed when absent.", elementName);
-        }
-        public static Message ExePackageDetectInformationRecommended(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.ExePackageDetectInformationRecommended, "The ExePackage/@DetectCondition attribute or child element ArpEntry is recommended so the package is only installed when absent.");
-        }
-        public static Message DownloadUrlNotSupportedForAttachedContainers(SourceLineNumber sourceLineNumbers, string containerId)
-        {
-            return Message(sourceLineNumbers, Ids.DownloadUrlNotSupportedForAttachedContainers, "The Container '{0}' is attached but included a @DownloadUrl attribute. Attached Containers cannot be downloaded so the download URL is being ignored.", containerId);
-        }
-        public static Message DownloadUrlNotSupportedForBAPayloads(SourceLineNumber sourceLineNumbers, string payloadId)
-        {
-            return Message(sourceLineNumbers, Ids.DownloadUrlNotSupportedForBAPayloads, "The BootstrapperApplication Payload '{0}' included a @DownloadUrl attribute. BootstrapperApplication Payloads cannot be downloaded so the download URL is being ignored.", payloadId);
-        }
-        public static Message DuplicateComponentGuidsMustHaveMutuallyExclusiveConditions(SourceLineNumber sourceLineNumbers, string componentId, string guid, string type, string keyPath)
-        {
-            return Message(sourceLineNumbers, Ids.DuplicateComponentGuidsMustHaveMutuallyExclusiveConditions, "Component/@Id='{0}' with {2} '{3}' has a @Guid value '{1}' that duplicates another component in this package. This is not officially supported by Windows Installer and cannot be used when creating patches. It otherwise works as long as all components with the same GUID have mutually-exclusive conditions. It is recommended to give each component its own unique GUID.", componentId, guid, type, keyPath);
-        }
-        public static Message DuplicatePrimaryKey(SourceLineNumber sourceLineNumbers, string primaryKey, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.DuplicatePrimaryKey, "The primary key '{0}' is duplicated in table '{1}' and will be ignored. Please remove one of the entries or rename a part of the primary key to avoid the collision.", primaryKey, tableName);
-        }
-        public static Message EmptyAttributeValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
-        {
-            return Message(sourceLineNumbers, Ids.EmptyAttributeValue, "The {0}/@{1} attribute's value cannot be an empty string. If you want the value to be null or empty, simply remove the entire attribute.", elementName, attributeName);
-        }
-        public static Message EmptyCabinet(SourceLineNumber sourceLineNumbers, string cabinetName, bool isPatch)
-        {
-            if (isPatch)
-            {
-                return Message(sourceLineNumbers, Ids.EmptyCabinet, "The cabinet '{0}' does not contain any files. If this patch contains no files, this warning can likely be safely ignored. Otherwise, try passing -p to torch.exe when first building the transforms, or add a ComponentRef to your PatchFamily authoring to pull changed files into the cabinet.", cabinetName, isPatch);
-            }
-            return Message(sourceLineNumbers, Ids.EmptyCabinet, "The cabinet '{0}' does not contain any files. If this installation contains no files, this warning can likely be safely ignored. Otherwise, please add files to the cabinet or remove it.", cabinetName);
-        }
        public static Message ExpectedForeignRow(SourceLineNumber sourceLineNumbers, string tableName, string primaryKey, string columnName, string columnValue, string foreignTableName)
        {
            return Message(sourceLineNumbers, Ids.ExpectedForeignRow, "The {0} table contains a row with primary key(s) '{1}' whose {2} column contains a value, '{3}', which specifies a foreign key relationship with the {4} table. However, since the expected foreign row specified by this value does not exist, this will result in some information being left out of the decompiled output.", tableName, primaryKey, columnName, columnValue, foreignTableName);
@@ -282,375 +56,19 @@ namespace WixToolset.Data
            return Message(sourceLineNumbers, Ids.ExpectedForeignRow, "The {0} table contains a row with primary key(s) '{1}' whose {2} and {4} columns contain the values, '{3}' and '{5}', which specify a foreign key relationship with the {6} table. However, since the expected foreign row specified by this value does not exist, this will result in some information being left out of the decompiled output.", tableName, primaryKey, columnName1, columnValue1, columnName2, columnValue2, foreignTableName);
        }
-        public static Message ExternalCabsAreNotSigned(string databaseFile)
-        {
-            return Message(null, Ids.ExternalCabsAreNotSigned, "The installer database '{0}' has external cabs, but at least one of them is not signed. Please ensure that all external cabs are signed, if you mean to sign them. If you don't mean to sign them, there is no need to inscribe the MSI as part of your build.", databaseFile);
-        }
-        public static Message FailedToDeleteTempDir(string directory)
-        {
-            return Message(null, Ids.FailedToDeleteTempDir, "Failed to delete temporary directory: {0}", directory);
-        }
-        public static Message FileSearchFileNameIssue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName1, string attributeName2)
-        {
-            return Message(sourceLineNumbers, Ids.FileSearchFileNameIssue, "The {0} element's {1} and {2} attributes were found. Due to a bug with the Windows Installer, only the Name or LongName attribute should be used. Use the Name attribute for 8.3 compliant file names and the LongName attribute for longer ones. When using only the LongName attribute, ICE03 should be ignored for the Signature table's FileName column.", elementName, attributeName1, attributeName2);
-        }
-        public static Message GeneratedShortFileNameConflict(SourceLineNumber sourceLineNumbers, string shortFileName)
-        {
-            return Message(sourceLineNumbers, Ids.GeneratedShortFileNameConflict, "The short file name '{0}' was generated for multiple files that may be installed to the same directory. This could be due to conflicting long file names specified by the File/@Name attribute. If that is the case, please resolve the conflict in those attributes. Otherwise, please manually set the File/@ShortName attribute on the conflicting row to fix the collision. If one of the colliding files was added via a patch, that short file name should be specified manually to avoid disturbing the original short file name.", shortFileName);
-        }
-        public static Message GeneratedShortFileNameConflict2(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.GeneratedShortFileNameConflict2, "The location of a conflicting generated short file name related to the previous warning.");
-        }
-        public static Message IdentifierCannotBeModularized(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string identifier, int length, int maximumLength)
-        {
-            return Message(sourceLineNumbers, Ids.IdentifierCannotBeModularized, "The {0}/@{1} attribute's value, '{2}', is {3} characters long. It will be too long if modularized. The identifier shouldn't be longer than {4} characters long to allow for modularization (appending a guid for merge modules).", elementName, attributeName, identifier, length, maximumLength);
-        }
-        public static Message IdentifierTooLong(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.IdentifierTooLong, "The {0}/@{1} attribute's value, '{2}', is too long for an identifier. Standard identifiers are 72 characters long or less.", elementName, attributeName, value);
-        }
-        public static Message IllegalActionInSequence(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalActionInSequence, "The {0} table contains an action '{1}' which is not allowed in this table. If this is a standard action then it is not valid for this table, if it is a custom action or dialog then this table does not accept actions of that type. This action will be left out of the decompiled output.", sequenceTableName, actionName);
-        }
        public static Message IllegalColumnValue(SourceLineNumber sourceLineNumbers, string tableName, string columnName, object value)
        {
            return Message(sourceLineNumbers, Ids.IllegalColumnValue, "The {0}.{1} column's value, '{2}', is not a recognized legal value. This information will be left out of the decompiled output.", tableName, columnName, value);
        }
-        public static Message IllegalRegistryKeyPath(SourceLineNumber sourceLineNumbers, string componentName, string registryId)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalRegistryKeyPath, "Component '{0}' specifies an illegal registry keypath of '{1}'. Since this entry actually represents a registry key, not a registry value, it cannot be the keypath.", componentName, registryId);
-        }
-        public static Message ImplicitComponentPrimaryFeature(string componentId)
-        {
-            return Message(null, Ids.ImplicitComponentPrimaryFeature, "The component '{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 ComponentRef/@Primary, ComponentGroupRef/@Primary, or FeatureGroupRef/@Primary locations for this component.", componentId);
-        }
-        public static Message ImplicitlyPerUser(SourceLineNumber sourceLineNumbers, string path)
-        {
-            return Message(sourceLineNumbers, Ids.ImplicitlyPerUser, "The MSI '{0}' does not explicitly indicate that it is a per-user package even though the ALLUSERS Property is blank. This suggests a per-user package so the Bundle will assume the package is per-user. If possible, use the Package/@InstallScope attribute to be explicit instead.", path);
-        }
-        public static Message ImplicitMergeModulePrimaryFeature(string componentId)
-        {
-            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 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);
-        }
-        public static Message InvalidHigherInstallerVersionInModule(SourceLineNumber sourceLineNumbers, string moduleId, int moduleInstallerVersion, int packageInstallerVersion)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidHigherInstallerVersionInModule, "Merge module '{0}' has an installer version of {1} which is greater than the package's installer version of {2}. Merging a module with a higher installer version than the package it is being merged into can result in invalid values in the resulting msi. You must set the Package/@InstallerVersion attribute to {1} or greater to merge this merge module into your package.", moduleId, moduleInstallerVersion, packageInstallerVersion);
-        }
-        public static Message InvalidFourPartVersion(SourceLineNumber sourceLineNumbers, string elementName, string version)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidFourPartVersion, "Invalid {0}/@Version '{1}'. {0} version has a max value of \"65535.65535.65535.65535\" and must be all numeric.", elementName, version);
-        }
-        public static Message InvalidRemoveFile(SourceLineNumber sourceLineNumbers, string file, string component)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidRemoveFile, "File '{0}' was removed from component '{1}'. Removing a file from a component will not result in the file being removed by a patch. You should author a RemoveFile element in your component to remove the file from the installation if you want the file to be removed.", file, component);
-        }
-        public static Message MajorUpgradePatchNotRecommended()
-        {
-            return Message(null, Ids.MajorUpgradePatchNotRecommended, "Changing the ProductCode in a patch is not recommended because the patch cannot be uninstalled nor can it be sequenced along with other patches for the target package. See https://learn.microsoft.com/en-us/windows/win32/msi/applying-major-upgrades-by-patching-the-local-installation-of-the-product for more information.");
-        }
-        public static Message MediaExternalCabinetFilenameIllegal(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.MediaExternalCabinetFilenameIllegal, "The {0}/@{1} attribute's value, '{2}', is not a valid external cabinet name. Legal cabinet names should follow 8.3 format: they should contain no more than 8 characters followed by an optional extension of no more than 3 characters. Any character except for the following may be used: \\ ? | > < : / * \" + , ; = [ ] (space). The Windows Installer team has recommended following the 8.3 format for external cabinet files and any other naming scheme is officially unsupported (which means it is not guaranteed to work on all platforms).", elementName, attributeName, value);
-        }
-        public static Message MergeRescheduledAction(SourceLineNumber sourceLineNumbers, string tableName, string actionName, string mergeModuleFile)
-        {
-            return Message(sourceLineNumbers, Ids.MergeRescheduledAction, "The {0} table contains an action '{1}' which cannot be merged from the merge module '{2}'. This action is likely colliding with an action in the database that is being created. The colliding action may have been authored in the database or merged in from another merge module. If this is a standard action, it is likely colliding due to a difference in the condition for the action in the database and merge module. If this is a custom action, it should only be declared in the database or one merge module.", tableName, actionName, mergeModuleFile);
-        }
-        public static Message MergeTableFailed(SourceLineNumber sourceLineNumbers, string tableName, string primaryKeys, string mergeModuleFile)
-        {
-            return Message(sourceLineNumbers, Ids.MergeTableFailed, "The {0} table contains a row with primary key(s) '{1}' which cannot be merged from the merge module '{2}'. This is likely due to collision of rows with the same primary key(s) (but other different values in other columns) between the database and the merge module.", tableName, primaryKeys, mergeModuleFile);
-        }
-        public static Message MissingUpgradeCode(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.MissingUpgradeCode, "The Package/@UpgradeCode attribute was not found; it is strongly recommended to ensure that this package can be upgraded.");
-        }
-        public static Message MsiTransactionLimitations(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.MsiTransactionLimitations, "MSI transactions have limitations that make it hard to use them successfully in a bundle. Test the bundle thoroughly, especially in upgrade scenarios and the scenario that required them in the first place.");
-        }
-        public static Message NestedInstall(SourceLineNumber sourceLineNumbers, string tableName, string columnName, object value)
-        {
-            return Message(sourceLineNumbers, Ids.NestedInstall, "The {0}.{1} column's value, '{2}', indicates a nested install. Nested installations are not supported by the WiX team. This action will be left out of the decompiled output.", tableName, columnName, value);
-        }
-        public static Message NewComponentAddedToExistingFeature(SourceLineNumber sourceLineNumbers, string component, string feature, string transformPath)
-        {
-            return Message(sourceLineNumbers, Ids.NewComponentAddedToExistingFeature, "Component '{0}' was added to feature '{1}' in the transform '{2}'. If you cannot guarantee that this feature will always be installed, you should consider adding new components to new top-level features to prevent prompts for source when installing this patch.", component, feature, transformPath);
-        }
-        public static Message NoPerMachineDependencies(SourceLineNumber sourceLineNumbers, string packageId)
-        {
-            return Message(sourceLineNumbers, Ids.NoPerMachineDependencies, "Bundle dependencies will not be registered on per-machine package '{0}' for a per-user bundle. Either make sure that all packages are installed per-machine, or author any per-machine dependencies as permanent packages.", packageId);
-        }
-        public static Message NotABinaryWixlib(string wixlib)
-        {
-            return Message(null, Ids.NotABinaryWixlib, "'{0}' is not a binary Wixlib and has no embedded files.", wixlib);
-        }
-        public static Message NullMsiAssemblyNameValue(SourceLineNumber sourceLineNumbers, string componentName, string name)
-        {
-            return Message(sourceLineNumbers, Ids.NullMsiAssemblyNameValue, "The assembly in component '{0}' has a null or empty {1} assembly name value.", componentName, name);
-        }
-        public static Message OrphanedProgId(SourceLineNumber sourceLineNumbers, string progId)
-        {
-            return Message(sourceLineNumbers, Ids.OrphanedProgId, "ProgId '{0}' is orphaned. It has no associated component, so it will never install. Every ProgId should have either a parent Class element or child Extension element (at any distance).", progId);
-        }
-        public static Message PackageCodeSet(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.PackageCodeSet, "The Package/@Id attribute has been set. Setting this attribute will allow nonidentical .msi files to have the same package code. This may be a problem because the package code is the primary identifier used by the installer to search for and validate the correct package for a given installation. If a package is changed without changing the package code, the installer may not use the newer package if both are still accessible to the installer. Please remove the Id attribute in order to automatically generate a new package code for each new .msi file.");
-        }
-        public static Message PatchTable(SourceLineNumber sourceLineNumbers, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.PatchTable, "The {0} table is added to the install package by a transform from a patch package (.msp) and not authored directly into an install package (.msi). The information in this table will be left out of the decompiled output.", tableName);
-        }
-        public static Message PathCanonicalized(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string originalValue, string canonicalValue)
-        {
-            return Message(sourceLineNumbers, Ids.PathCanonicalized, "The {0}/@{1} attribute's value, '{2}', has been canonicalized to '{3}'.", elementName, attributeName, originalValue, canonicalValue);
-        }
-        public static Message PerUserButForcingPerMachine(SourceLineNumber sourceLineNumbers, string path)
-        {
-            return Message(sourceLineNumbers, Ids.PerUserButForcingPerMachine, "The MSI '{0}' is a per-user package being forced to per-machine. Verify that the MsiPackage/@ForcePerMachine attribute is expected and that the per-user package works correctly when forced to install per-machine.", path);
-        }
-        public static Message PlaceholderValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.PlaceholderValue, "The {0}/@{1} attribute's value, '{2}', is a placeholder value used in example files. Please replace this placeholder with the appropriate value.", elementName, attributeName, value);
-        }
-        public static Message PossiblyIncorrectTypelibVersion(SourceLineNumber sourceLineNumbers, string id)
-        {
-            return Message(sourceLineNumbers, Ids.PossiblyIncorrectTypelibVersion, "The Typelib table entry with Id '{0}' could have an incorrect version of '256.0'. InstallShield has a bug relating to the Typelib Version column: it will incorrectly set the value '65536' in to represent version '1.0'. However, this number actually corresponds to version '256.0'. This bug will not affect the typelib version that is registered during installation, however, it will prevent the Windows Installer from correctly identifying whether a typelib is already installed and lead to unnecessary reinstallations of the typelib.", id);
-        }
-        public static Message PreprocessorUnknownPragma(SourceLineNumber sourceLineNumbers, string pragmaName)
-        {
-            return Message(sourceLineNumbers, Ids.PreprocessorUnknownPragma, "The pragma '{0}' is unknown. Please ensure you have referenced the extension that defines this pragma.", pragmaName);
-        }
-        public static Message PreprocessorWarning(SourceLineNumber sourceLineNumbers, string message)
-        {
-            return Message(sourceLineNumbers, Ids.PreprocessorWarning, "{0}", message);
-        }
-        public static Message ProductIdAuthored(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.ProductIdAuthored, "The 'ProductID' property should not be directly authored because it will prevent the ValidateProductID standard action from performing any validation during the installation. This property will be set by the ValidateProductID standard action or control event.");
-        }
-        public static Message PropertyModularizationSuppressed(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.PropertyModularizationSuppressed, "The Property/@SuppressModularization attribute has been set to 'yes'. Using this functionality is strongly discouraged; it should only be necessary as a workaround of last resort in rare scenarios.");
-        }
-        public static Message PropertyUseless(SourceLineNumber sourceLineNumbers, string id)
-        {
-            return Message(sourceLineNumbers, Ids.PropertyUseless, "Property '{0}' does not contain a Value attribute and is not marked as Admin, Secure, or Hidden. The Property element is being ignored.", id);
-        }
-        public static Message PropertyValueContainsPropertyReference(SourceLineNumber sourceLineNumbers, string propertyId, string otherProperty)
-        {
-            return Message(sourceLineNumbers, Ids.PropertyValueContainsPropertyReference, "The '{0}' Property contains '[{1}]' in its value which is an illegal reference to another property. If this value is a string literal, not a property reference, please ignore this warning. To set a property with the value of another property, use a CustomAction with Property and Value attributes.", propertyId, otherProperty);
-        }
-        public static Message RelatedAttributeConditionallyIgnored(SourceLineNumber sourceLineNumbers, string recessiveAttribute, string dominantAttribute, string dominantValue)
-        {
-            return Message(sourceLineNumbers, Ids.RelatedAttributeConditionallyIgnored, "Ignoring attribute {0} because attribute {1} is set to {2}.", recessiveAttribute, dominantAttribute, dominantValue);
-        }
-        public static Message RemotePayloadsMustNotAlsoBeCompressed(SourceLineNumber sourceLineNumbers, string elementName)
-        {
-            return Message(sourceLineNumbers, Ids.RemotePayloadsMustNotAlsoBeCompressed, "The {0}/@Compressed attribute must have value 'no' when a RemotePayload child element is present. RemotePayload indicates that a package will always be downloaded and cannot be compressed into a bundle. To eliminate this warning, explicitly set the {0}/@Compressed attribute to 'no'.", elementName);
-        }
-        public static Message RemoveFileNameRequired(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.RemoveFileNameRequired, "The RemoveFile/@Name attribute will soon become required. In order to match the old functionality of not specifying this attribute, please use the new RemoveFolder element instead.");
-        }
-        public static Message RequiresMsi200for64bitPackage(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.RequiresMsi200for64bitPackage, "Package/@InstallerVersion must be 200 or greater for a 64-bit package. The value will be changed to 200. Please specify a value of 200 or greater in order to eliminate this warning.");
-        }
-        public static Message RequiresMsi500forArmPackage(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.RequiresMsi500forArmPackage, "Package/@InstallerVersion must be 500 or greater for an ARM64 package. The value will be changed to 500. Please specify a value of 500 or greater in order to eliminate this warning.");
-        }
-        public static Message ReservedAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
-        {
-            return Message(sourceLineNumbers, Ids.ReservedAttribute, "The {0}/@{1} attribute is reserved for future use and has no effect in this version of the WiX toolset.", elementName, attributeName);
-        }
-        public static Message RetainRangeMismatch(SourceLineNumber sourceLineNumbers, string fileId)
-        {
-            return Message(sourceLineNumbers, Ids.RetainRangeMismatch, "Mismatch in RetainRangeCounts for the file '{0}' - ignoring the retain ranges.", fileId);
-        }
-        public static Message ServiceConfigFamilyNotSupported(SourceLineNumber sourceLineNumbers, string elementName)
-        {
-            return Message(sourceLineNumbers, Ids.ServiceConfigFamilyNotSupported, "{0} functionality is documented in the Windows Installer SDK to \"not [work] as expected.\" Consider replacing {0} with the WixToolset.Util.wixext ServiceConfig element.", elementName);
-        }
-        public static Message SkippingMergeModuleTable(SourceLineNumber sourceLineNumbers, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.SkippingMergeModuleTable, "The {0} table can only be represented in WiX for merge modules. The information in this table will be left out of the decompiled output.", tableName);
-        }
-        public static Message StandardDirectoryConflictInMergeModule(SourceLineNumber sourceLineNumbers, string directory, string standardDirectory)
-        {
-            return Message(sourceLineNumbers, Ids.StandardDirectoryConflictInMergeModule, "The Directory '{0}' starts with the same Id as the standard folder in Windows Installer '{1}'. A directory Id that begins with the same Id as a standard folder that is in an MSM may encounter a conflict when merging the MSM into an MSI. This may result in the contents of this merge module being installed to an unexpected location. To eliminate this warning, change your directory Id to not start with the same Id as any standard folders.", directory, standardDirectory);
-        }
-        public static Message SuppressAction(SourceLineNumber sourceLineNumbers, string action, string sequenceName)
-        {
-            return Message(sourceLineNumbers, Ids.SuppressAction, "The action '{0}' in the {1} table is being suppressed.", action, sequenceName);
-        }
-        public static Message SuppressAction2(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.SuppressAction2, "The location of the suppressed action related to previous warning.");
-        }
-        public static Message SuppressMergedAction(string action, string sequenceName)
-        {
-            return Message(null, Ids.SuppressMergedAction, "The merged action '{0}' in the {1} table is being suppressed.", action, sequenceName);
-        }
-        public static Message TableIncompatibleWithInstallerVersion(SourceLineNumber sourceLineNumbers, string tableName, int packageInstallerVersion)
-        {
-            return Message(sourceLineNumbers, Ids.TableIncompatibleWithInstallerVersion, "Using table '{0}' requires a version of Windows Installer greater than specified in your package ('{1}').", tableName, packageInstallerVersion);
-        }
-        public static Message TargetDirCorrectedDefaultDir()
-        {
-            return Message(null, Ids.TargetDirCorrectedDefaultDir, "The Directory with Id 'TARGETDIR' must have the value 'SourceDir' in its 'DefaultDir' column. This has been automatically corrected for you in the decompiled output.");
-        }
-        public static Message TooManyProgIds(SourceLineNumber sourceLineNumbers, string clsId, string progId, string otherClsId)
-        {
-            return Message(sourceLineNumbers, Ids.TooManyProgIds, "Class '{0}' tried to use ProgId '{1}' which has already been associated with class '{2}'. This information will be left out of the decompiled output.", clsId, progId, otherClsId);
-        }
-        public static Message SymbolNotTranslatedToOutput(IntermediateSymbol symbol)
-        {
-            var symbolString = $"SymbolName: '{symbol.Definition.Name}', Id: '{symbol.Id?.Id}'";
-            return Message(symbol.SourceLineNumbers, Ids.SymbolNotTranslatedToOutput, "The binder doesn't know how to place the following symbol into the output: {0}", symbolString);
-        }
-        public static Message UnableToFindFileFromCabOrImage(SourceLineNumber sourceLineNumbers, string existingFileSpec, string srcFileSpec)
-        {
-            return Message(sourceLineNumbers, Ids.UnableToFindFileFromCabOrImage, "Unable to find existing file {0} to place in src location {1}. Will likely cause a linker break.", existingFileSpec, srcFileSpec);
-        }
-        public static Message UnableToResetAcls(string error)
-        {
-            return Message(null, Ids.UnableToResetAcls, "Unable to reset acls on destination files. Exception detail: {0}", error);
-        }
-        public static Message UnavailableBundleConditionVariable(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string variable, string illegalValueList)
-        {
-            return Message(sourceLineNumbers, Ids.UnavailableBundleConditionVariable, "{0}/@{1} contains the built-in Variable '{2}', which is not available when it is evaluated. (Unavailable Variables are: {3}.). Rewrite the condition to avoid Variables that are never valid during its evaluation.", elementName, attributeName, variable, illegalValueList);
-        }
-        public static Message UnclearShortcut(SourceLineNumber sourceLineNumbers, string shortcutId, string fileId, string componentId)
-        {
-            return Message(sourceLineNumbers, Ids.UnclearShortcut, "Because it is an advertised shortcut, the target of shortcut '{0}' will be the keypath of component '{2}' rather than parent file '{1}'. To eliminate this warning, you can (1) make the Shortcut element a child of the File element that is the keypath of component '{2}', (2) make file '{1}' the keypath of component '{2}', or (3) remove the @Advertise attribute so the shortcut is a non-advertised shortcut.", shortcutId, fileId, componentId);
-        }
-        public static Message UnexpectedEntrySection(SourceLineNumber sourceLineNumbers, string sectionType, string expectedType)
-        {
-            return Message(sourceLineNumbers, Ids.UnexpectedEntrySection, "Found entry point <{0}> that does not match expected <{1}> output type. Verify that your source code is correct and matches the expected output type.", sectionType, expectedType);
-        }
-        public static Message UnexpectedTableInProduct(SourceLineNumber sourceLineNumbers, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.UnexpectedTableInProduct, "An unexpected row in the '{0}' table was found in this package. Packages should not contain the '{0}' table.", tableName);
-        }
-        public static Message UnknownAction(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
-        {
-            return Message(sourceLineNumbers, Ids.UnknownAction, "The {0} table contains an action '{1}' which is not a known custom action, dialog, or standard action. This action will be left out of the decompiled output.", sequenceTableName, actionName);
-        }
        public static Message UnknownPermission(SourceLineNumber sourceLineNumbers, string tableName, string primaryKey, int bitPosition)
        {
            return Message(sourceLineNumbers, Ids.UnknownPermission, "The {0} table contains a row with primary key '{1}' which has an unknown permission at bit {2}.", tableName, primaryKey, bitPosition);
        }
-        public static Message UnrepresentableColumnValue(SourceLineNumber sourceLineNumbers, string tableName, string columnName, object value)
+        public static Message DownloadUrlNotSupportedForBAPayloads(SourceLineNumber sourceLineNumbers, string payloadId)
-        {
-            return Message(sourceLineNumbers, Ids.UnrepresentableColumnValue, "The {0}.{1} column's value, '{2}', cannot currently be represented in the WiX schema.", tableName, columnName, value);
-        }
-        public static Message UnsupportedCommandLineArgument(string arg)
-        {
-            return Message(null, Ids.UnsupportedCommandLineArgument, "'{0}' is not a valid command line argument.", arg);
-        }
-        public static Message UnsupportedCommandLineArgumentValue(string arg, string value, string fallback)
-        {
-            return Message(null, Ids.UnsupportedCommandLineArgument, "The value '{0}' is not a valid value for command line argument '{1}'. Using the value '{2}' instead.", value, arg, fallback);
-        }
-        public static Message UpdateOfNonKeyPathFile(string nonKeyPathFileId, string componentId, string keyPathFileId)
-        {
-            return Message(null, Ids.UpdateOfNonKeyPathFile, "File '{0}' in Component '{1}' was changed, but the KeyPath file '{2}' was not. This file will not be patched on the target system if the REINSTALLMODE does not contain 'A'. The KeyPath file should also be changed and included in your patch.", nonKeyPathFileId, componentId, keyPathFileId);
-        }
-        public static Message UxPayloadsOnlySupportEmbedding(SourceLineNumber sourceLineNumbers, string sourceFile)
-        {
-            return Message(sourceLineNumbers, Ids.UxPayloadsOnlySupportEmbedding, "A bootstrapper application or bundle extension payload ('{0}') was marked for something other than embedded packaging, possibly because it included a @DownloadUrl attribute. Bootstrapper application and bundle extension payloads must be embedded in the bundle, so the requested packaging is being ignored and the file is being embedded anyway.", sourceFile);
-        }
-        public static Message ValidationFailedDueToSystemPolicy()
-        {
-            return Message(null, Ids.ValidationFailedDueToSystemPolicy, "Validation could not run due to system policy. To eliminate this warning, run the process as admin or suppress ICE validation.");
-        }
-        public static Message ValidationWarning(SourceLineNumber sourceLineNumbers, string ice, string message)
-        {
-            return Message(sourceLineNumbers, Ids.ValidationWarning, "{0}: {1}", ice, message);
-        }
-        public static Message VariableDeclarationCollision(SourceLineNumber sourceLineNumbers, string variableName, string variableValue, string variableCollidingValue)
        {
-            return Message(sourceLineNumbers, Ids.VariableDeclarationCollision, "The variable '{0}' with value '{1}' was previously declared with value '{2}'.", variableName, variableValue, variableCollidingValue);
+            return Message(sourceLineNumbers, Ids.DownloadUrlNotSupportedForBAPayloads, "The BootstrapperApplication Payload '{0}' included a @DownloadUrl attribute. BootstrapperApplication Payloads cannot be downloaded so the download URL is being ignored.", payloadId);
        }
        public static Message InvalidMsiProductVersion(SourceLineNumber sourceLineNumbers, string version, string package)
@@ -669,14 +87,10 @@ namespace WixToolset.Data
                version);
        }
-        public static Message CollidingModularizationTypes(string tableName, string columnName, string foreignTableName, int foreignColumnNumber, string modularizationType, string foreignModularizationType)
+        public static Message SymbolNotTranslatedToOutput(IntermediateSymbol symbol)
-        {
-            return Message(null, Ids.CollidingModularizationTypes, "The definition for the '{0}' table's '{1}' column is a foreign key relationship to the '{2}' table's column number {3}. The modularization types of the two column definitions differ: table '{0}' uses type {4} and table '{2}' uses type {5}. Change one of the modularization types so that they match.", tableName, columnName, foreignTableName, foreignColumnNumber, modularizationType, foreignModularizationType);
-        }
-        public static Message InvalidEnvironmentVariable(string environmentVariable, string value, string defaultValue)
        {
-            return Message(null, Ids.InvalidEnvironmentVariable, "The {0} environment variable is set to an invalid value of '{1}'. The default value '{2}' will be used instead.", environmentVariable, value, defaultValue);
+            var symbolString = $"SymbolName: '{symbol.Definition.Name}', Id: '{symbol.Id?.Id}'";
+            return Message(symbol.SourceLineNumbers, Ids.SymbolNotTranslatedToOutput, "The binder doesn't know how to place the following symbol into the output: {0}", symbolString);
        }
        public static Message WindowsInstallerFileTooLarge(SourceLineNumber sourceLineNumbers, string path, string fileDescription)
@@ -689,154 +103,23 @@ namespace WixToolset.Data
            return Message(sourceLineNumbers, Ids.WindowsInstallerFileTooLarge, "The Windows Installer does not support {0} files larger than 2GB in size. Reduce the size or number of files embedded in '{1}' or the installation will likely fail with an unexpected error.", fileDescription, path);
        }
-        public static Message InvalidWixVersion(SourceLineNumber sourceLineNumbers, string version, string elementName, string attributeName)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidWixVersion, "Invalid WixVersion '{0}' in {1}/@'{2}'. Comparisons may yield unexpected results.", version, elementName, attributeName);
-        }
-        public static Message VBScriptIsDeprecated(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.VBScriptIsDeprecated, "VBScript is a deprecated Windows component: https://learn.microsoft.com/en-us/windows/whats-new/deprecated-features. VBScript custom actions might fail on some Windows systems. Rewrite or eliminate VBScript custom actions for best compatibility.");
-        }
        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
        {
            return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args);
        }
-        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args)
-        {
-            return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, resourceManager, resourceName, args);
-        }
        public enum Ids
        {
-            IdentifierCannotBeModularized = 1000,
-            EmptyAttributeValue = 1001,
-            UnableToFindFileFromCabOrImage = 1002,
-            CopyFileFileIdUseless = 1003,
-            NestedInstall = 1004,
-            OrphanedProgId = 1005,
-            PropertyUseless = 1006,
-            RemoveFileNameRequired = 1007,
-            SuppressAction = 1008,
-            SuppressMergedAction = 1009,
-            TargetDirCorrectedDefaultDir = 1010,
-            AccessDeniedForDeletion = 1011,
-            DirectoryInUse = 1012,
-            AccessDeniedForSettingAttributes = 1013,
-            UnknownAction = 1024,
-            IdentifierTooLong = 1026,
            UnknownPermission = 1030,
-            DirectoryRedundantNames = 1031,
-            UnableToResetAcls = 1032,
-            MediaExternalCabinetFilenameIllegal = 1033,
-            DeprecatedPreProcVariable = 1034,
-            FileSearchFileNameIssue = 1043,
-            AmbiguousFileOrDirectoryName = 1044,
-            PossiblyIncorrectTypelibVersion = 1048,
-            ImplicitComponentPrimaryFeature = 1049,
-            ActionSequenceCollision = 1050,
-            ActionSequenceCollision2 = 1051,
-            SuppressAction2 = 1052,
-            UnexpectedTableInProduct = 1053,
            DeprecatedAttribute = 1054,
-            MergeRescheduledAction = 1055,
-            MergeTableFailed = 1056,
-            DecompiledStandardActionRelativelyScheduledInModule = 1057,
-            IllegalActionInSequence = 1058,
            ExpectedForeignRow = 1059,
-            DecompilingAsCustomTable = 1060,
-            SkippingMergeModuleTable = 1062,
-            UnrepresentableColumnValue = 1064,
-            DeprecatedTable = 1065,
-            PatchTable = 1066,
            IllegalColumnValue = 1067,
-            DeprecatedLongNameAttribute = 1069,
-            GeneratedShortFileNameConflict = 1070,
-            GeneratedShortFileNameConflict2 = 1071,
-            DangerousTableInMergeModule = 1072,
-            DeprecatedLocalizationVariablePrefix = 1073,
-            PlaceholderValue = 1074,
-            MissingUpgradeCode = 1075,
-            ValidationWarning = 1076,
-            PropertyValueContainsPropertyReference = 1077,
-            DeprecatedUpgradeProperty = 1078,
-            EmptyCabinet = 1079,
-            DeprecatedRegistryElement = 1080,
-            IllegalRegistryKeyPath = 1081,
-            ProductIdAuthored = 1083,
-            ImplicitMergeModulePrimaryFeature = 1084,
-            DeprecatedIgnoreModularizationElement = 1085,
-            PropertyModularizationSuppressed = 1086,
-            DeprecatedPackageCompressedAttribute = 1087,
-            DeprecatedQuestionMarksGuid = 1090,
-            PackageCodeSet = 1091,
-            InvalidFourPartVersion = 1093,
-            InvalidRemoveFile = 1095,
-            PreprocessorWarning = 1096,
-            UpdateOfNonKeyPathFile = 1097,
-            UnsupportedCommandLineArgument = 1098,
-            MajorUpgradePatchNotRecommended = 1099,
-            RetainRangeMismatch = 1100,
-            DefaultLanguageUsedForVersionedFile = 1101,
-            DefaultLanguageUsedForUnversionedFile = 1102,
-            DefaultVersionUsedForUnversionedFile = 1103,
-            InvalidHigherInstallerVersionInModule = 1104,
-            ValidationFailedDueToSystemPolicy = 1105,
-            ColumnsIncompatibleWithInstallerVersion = 1106,
-            TableIncompatibleWithInstallerVersion = 1107,
-            DeprecatedCommandLineSwitch = 1108,
-            UnexpectedEntrySection = 1109,
-            NewComponentAddedToExistingFeature = 1110,
            DeprecatedAttributeValue = 1111,
-            UnclearShortcut = 1113,
-            TooManyProgIds = 1114,
-            BadColumnDataIgnored = 1115,
-            NullMsiAssemblyNameValue = 1116,
-            InvalidAttributeCombination = 1117,
-            VariableDeclarationCollision = 1118,
-            DuplicatePrimaryKey = 1119,
-            RequiresMsi200for64bitPackage = 1121,
-            ExternalCabsAreNotSigned = 1122,
-            FailedToDeleteTempDir = 1123,
-            StandardDirectoryConflictInMergeModule = 1124,
-            PreprocessorUnknownPragma = 1125,
-            DeprecatedComponentGroupId = 1126,
-            UxPayloadsOnlySupportEmbedding = 1127,
-            DiscardedRollbackBoundary = 1129,
            DeprecatedElement = 1130,
-            CannotUpdateCabCache = 1131,
            DownloadUrlNotSupportedForBAPayloads = 1132,
-            DiscouragedAllUsersValue = 1133,
-            ImplicitlyPerUser = 1134,
-            PerUserButForcingPerMachine = 1135,
-            AttributeShouldContain = 1136,
-            DuplicateComponentGuidsMustHaveMutuallyExclusiveConditions = 1137,
-            DeprecatedRegistryKeyActionAttribute = 1138,
-            NotABinaryWixlib = 1139,
-            NoPerMachineDependencies = 1140,
-            DownloadUrlNotSupportedForAttachedContainers = 1141,
-            ReservedAttribute = 1142,
-            RequiresMsi500forArmPackage = 1143,
-            RemotePayloadsMustNotAlsoBeCompressed = 1144,
-            AllChangesIncludedInPatch = 1145,
-            RelatedAttributeConditionallyIgnored = 1146,
-            BackslashTerminateInlineDirectorySyntax = 1147,
            InvalidMsiProductVersion = 1148,
-            ServiceConfigFamilyNotSupported = 1149,
            SymbolNotTranslatedToOutput = 1150,
-            MsiTransactionLimitations = 1151,
-            PathCanonicalized = 1152,
-            DetectConditionRecommended = 1153,
-            CollidingModularizationTypes = 1156,
-            InvalidEnvironmentVariable = 1157,
            WindowsInstallerFileTooLarge = 1158,
-            UnavailableBundleConditionVariable = 1159,
-            DiscardedRollbackBoundary2 = 1160,
-            ExePackageDetectInformationRecommended = 1161,
-            InvalidWixVersion = 1162,
-            VBScriptIsDeprecated = 1163,
        }
    }
 }
diff --git a/src/ext/Util/wixext/UtilDecompiler.cs b/src/ext/Util/wixext/UtilDecompiler.cs
index fb6d02e5..55bb39c9 100644
--- a/src/ext/Util/wixext/UtilDecompiler.cs
+++ b/src/ext/Util/wixext/UtilDecompiler.cs
@@ -292,7 +292,7 @@ namespace WixToolset.Util
                        break;
                    default:
-                        this.Messaging.Write(WarningMessages.UnrepresentableColumnValue(row.SourceLineNumbers, table.Name, "InstallMode", installMode));
+                        this.Messaging.Write(UtilWarnings.UnrepresentableColumnValue(row.SourceLineNumbers, table.Name, "InstallMode", installMode));
                        break;
                }
@@ -347,7 +347,7 @@ namespace WixToolset.Util
                        break;
                    default:
-                        this.Messaging.Write(WarningMessages.UnrepresentableColumnValue(row.SourceLineNumbers, table.Name, "Attributes", attributes));
+                        this.Messaging.Write(UtilWarnings.UnrepresentableColumnValue(row.SourceLineNumbers, table.Name, "Attributes", attributes));
                        break;
                }
diff --git a/src/ext/Util/wixext/UtilWarnings.cs b/src/ext/Util/wixext/UtilWarnings.cs
index b65abe45..d0d22647 100644
--- a/src/ext/Util/wixext/UtilWarnings.cs
+++ b/src/ext/Util/wixext/UtilWarnings.cs
@@ -18,6 +18,11 @@ namespace WixToolset.Util
            return Message(sourceLineNumbers, Ids.RequiredAttributeForWindowsXP, "The {0}/@{1} attribute must be specified to successfully install on Windows XP.  You can ignore this warning if this installation does not install on Windows XP.", elementName, attributeName);
        }
+        public static Message UnrepresentableColumnValue(SourceLineNumber sourceLineNumbers, string tableName, string columnName, object value)
+        {
+            return Message(sourceLineNumbers, Ids.UnrepresentableColumnValue, "The {0}.{1} column's value, '{2}', cannot currently be represented in the WiX schema.", tableName, columnName, value);
+        }
        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
        {
            return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args);
@@ -30,6 +35,7 @@ namespace WixToolset.Util
        public enum Ids
        {
+            UnrepresentableColumnValue = 1064,
            DeprecatedPerfCounterElement = 5153,
            RequiredAttributeForWindowsXP = 5154,
        }
diff --git a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index 83dfb606..64e65a55 100644
--- a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -613,7 +613,7 @@ namespace WixToolset.Core.Burn
                    !facade.PackageSymbol.Permanent &&
                    dependencySymbolsById.ContainsKey(facade.PackageId))
                {
-                    this.Messaging.Write(WarningMessages.NoPerMachineDependencies(facade.PackageSymbol.SourceLineNumbers, facade.PackageId));
+                    this.Messaging.Write(BurnBackendWarnings.NoPerMachineDependencies(facade.PackageSymbol.SourceLineNumbers, facade.PackageId));
                }
            }
        }
diff --git a/src/wix/WixToolset.Core.Burn/Bind/ResolveDownloadUrlsCommand.cs b/src/wix/WixToolset.Core.Burn/Bind/ResolveDownloadUrlsCommand.cs
index c678b114..d65aac21 100644
--- a/src/wix/WixToolset.Core.Burn/Bind/ResolveDownloadUrlsCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bind/ResolveDownloadUrlsCommand.cs
@@ -51,7 +51,7 @@ namespace WixToolset.Core.Burn.Bind
                {
                    if (!String.IsNullOrEmpty(container.DownloadUrl))
                    {
-                        this.Messaging.Write(WarningMessages.DownloadUrlNotSupportedForAttachedContainers(container.SourceLineNumbers, container.Id.Id));
+                        this.Messaging.Write(BurnBackendWarnings.DownloadUrlNotSupportedForAttachedContainers(container.SourceLineNumbers, container.Id.Id));
                    }
                }
            }
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs
index 18227ad7..8b31d10f 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs
@@ -67,7 +67,7 @@ namespace WixToolset.Core.Burn.Bundles
                            if (insideMsiTransaction && !warnedMsiTransaction)
                            {
                                warnedMsiTransaction = true;
-                                this.Messaging.Write(WarningMessages.MsiTransactionLimitations(pendingRollbackBoundary.SourceLineNumbers));
+                                this.Messaging.Write(BurnBackendWarnings.MsiTransactionLimitations(pendingRollbackBoundary.SourceLineNumbers));
                            }
                            usedBoundaries.Add(pendingRollbackBoundary);
@@ -107,8 +107,8 @@ namespace WixToolset.Core.Burn.Bundles
                        var nextRollbackBoundary = boundariesById[groupSymbol.ChildId];
                        if (null != pendingRollbackBoundary && pendingRollbackBoundary.Id.Id != BurnConstants.BundleDefaultBoundaryId)
                        {
-                            this.Messaging.Write(WarningMessages.DiscardedRollbackBoundary(nextRollbackBoundary.SourceLineNumbers, nextRollbackBoundary.Id.Id));
+                            this.Messaging.Write(BurnBackendWarnings.DiscardedRollbackBoundary(nextRollbackBoundary.SourceLineNumbers, nextRollbackBoundary.Id.Id));
-                            this.Messaging.Write(WarningMessages.DiscardedRollbackBoundary2(lastRollbackBoundary.SourceLineNumbers));
+                            this.Messaging.Write(BurnBackendWarnings.DiscardedRollbackBoundary2(lastRollbackBoundary.SourceLineNumbers));
                        }
                        else
                        {
@@ -120,7 +120,7 @@ namespace WixToolset.Core.Burn.Bundles
            if (null != pendingRollbackBoundary)
            {
-                this.Messaging.Write(WarningMessages.DiscardedRollbackBoundary(pendingRollbackBoundary.SourceLineNumbers, pendingRollbackBoundary.Id.Id));
+                this.Messaging.Write(BurnBackendWarnings.DiscardedRollbackBoundary(pendingRollbackBoundary.SourceLineNumbers, pendingRollbackBoundary.Id.Id));
            }
            // With the forward rollback boundaries assigned, we can now go
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/PerformBundleBackendValidationCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/PerformBundleBackendValidationCommand.cs
index 01df9f32..c7c92a64 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/PerformBundleBackendValidationCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/PerformBundleBackendValidationCommand.cs
@@ -117,7 +117,7 @@ namespace WixToolset.Core.Burn.Bundles
                {
                    if (!this.BackendHelper.IsValidWixVersion(symbol.ArpDisplayVersion))
                    {
-                        this.Messaging.Write(WarningMessages.InvalidWixVersion(symbol.SourceLineNumbers, symbol.ArpDisplayVersion, "ArpEntry", "Version"));
+                        this.Messaging.Write(BurnBackendWarnings.InvalidWixVersion(symbol.SourceLineNumbers, symbol.ArpDisplayVersion, "ArpEntry", "Version"));
                    }
                }
            }
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
index 783c9f6b..8b370b90 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
@@ -294,7 +294,7 @@ namespace WixToolset.Core.Burn.Bundles
            {
                if (!perMachine)
                {
-                    this.Messaging.Write(WarningMessages.PerUserButForcingPerMachine(this.PackagePayload.SourceLineNumbers, this.PackageId));
+                    this.Messaging.Write(BurnBackendWarnings.PerUserButForcingPerMachine(this.PackagePayload.SourceLineNumbers, this.PackageId));
                    this.ChainPackage.PerMachine = true; // ensure that we think the package is per-machine.
                }
@@ -308,7 +308,7 @@ namespace WixToolset.Core.Burn.Bundles
                    // Not forced per-machine and no ALLUSERS property, flip back to per-user.
                    if (perMachine)
                    {
-                        this.Messaging.Write(WarningMessages.ImplicitlyPerUser(this.ChainPackage.SourceLineNumbers, this.PackageId));
+                        this.Messaging.Write(BurnBackendWarnings.ImplicitlyPerUser(this.ChainPackage.SourceLineNumbers, this.PackageId));
                        this.ChainPackage.PerMachine = false;
                    }
                }
@@ -321,7 +321,7 @@ namespace WixToolset.Core.Burn.Bundles
                }
                else if (allusers.Equals("2", StringComparison.Ordinal))
                {
-                    this.Messaging.Write(WarningMessages.DiscouragedAllUsersValue(this.ChainPackage.SourceLineNumbers, this.PackageId, perMachine ? "machine" : "user"));
+                    this.Messaging.Write(BurnBackendWarnings.DiscouragedAllUsersValue(this.ChainPackage.SourceLineNumbers, this.PackageId, perMachine ? "machine" : "user"));
                }
                else
                {
diff --git a/src/wix/WixToolset.Core.Burn/BurnBackendWarnings.cs b/src/wix/WixToolset.Core.Burn/BurnBackendWarnings.cs
index 9c7cde13..ab045981 100644
--- a/src/wix/WixToolset.Core.Burn/BurnBackendWarnings.cs
+++ b/src/wix/WixToolset.Core.Burn/BurnBackendWarnings.cs
@@ -51,6 +51,51 @@ namespace WixToolset.Core.Burn
            return Message(sourceLineNumbers, Ids.UnknownMsiPackagePlatform, "The MsiPackage '{0}' has an unknown platform: '{1}'. It is assumed to be 64-bit.", msiPath, platform);
        }
+        public static Message DiscardedRollbackBoundary(SourceLineNumber sourceLineNumbers, string rollbackBoundaryId)
+        {
+            return Message(sourceLineNumbers, Ids.DiscardedRollbackBoundary, "The RollbackBoundary '{0}' was discarded because it was not followed by a package. Without a package the rollback boundary doesn't do anything. Verify that the RollbackBoundary element is not followed by another RollbackBoundary and that the element is not at the end of the chain.", rollbackBoundaryId);
+        }
+        public static Message DiscardedRollbackBoundary2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.DiscardedRollbackBoundary2, "Location of rollback boundary related to previous warning.");
+        }
+        public static Message DiscouragedAllUsersValue(SourceLineNumber sourceLineNumbers, string path, string machineOrUser)
+        {
+            return Message(sourceLineNumbers, Ids.DiscouragedAllUsersValue, "Bundles require a package to be either per-machine or per-user. The MSI '{0}' ALLUSERS Property is set to '2' which may change from per-user to per-machine at install time. The Bundle will assume the package is per-{1} and will not work correctly if that changes. If possible, use the Package/@Scope attribute values 'perUser' or 'perMachine' instead.", path, machineOrUser);
+        }
+        public static Message DownloadUrlNotSupportedForAttachedContainers(SourceLineNumber sourceLineNumbers, string containerId)
+        {
+            return Message(sourceLineNumbers, Ids.DownloadUrlNotSupportedForAttachedContainers, "The Container '{0}' is attached but included a @DownloadUrl attribute. Attached Containers cannot be downloaded so the download URL is being ignored.", containerId);
+        }
+        public static Message ImplicitlyPerUser(SourceLineNumber sourceLineNumbers, string path)
+        {
+            return Message(sourceLineNumbers, Ids.ImplicitlyPerUser, "The MSI '{0}' does not explicitly indicate that it is a per-user package even though the ALLUSERS Property is blank. This suggests a per-user package so the Bundle will assume the package is per-user. If possible, use the Package/@InstallScope attribute to be explicit instead.", path);
+        }
+        public static Message MsiTransactionLimitations(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.MsiTransactionLimitations, "MSI transactions have limitations that make it hard to use them successfully in a bundle. Test the bundle thoroughly, especially in upgrade scenarios and the scenario that required them in the first place.");
+        }
+        public static Message NoPerMachineDependencies(SourceLineNumber sourceLineNumbers, string packageId)
+        {
+            return Message(sourceLineNumbers, Ids.NoPerMachineDependencies, "Bundle dependencies will not be registered on per-machine package '{0}' for a per-user bundle. Either make sure that all packages are installed per-machine, or author any per-machine dependencies as permanent packages.", packageId);
+        }
+        public static Message PerUserButForcingPerMachine(SourceLineNumber sourceLineNumbers, string path)
+        {
+            return Message(sourceLineNumbers, Ids.PerUserButForcingPerMachine, "The MSI '{0}' is a per-user package being forced to per-machine. Verify that the MsiPackage/@ForcePerMachine attribute is expected and that the per-user package works correctly when forced to install per-machine.", path);
+        }
+        public static Message InvalidWixVersion(SourceLineNumber sourceLineNumbers, string version, string elementName, string attributeName)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidWixVersion, "Invalid WixVersion '{0}' in {1}/@'{2}'. Comparisons may yield unexpected results.", version, elementName, attributeName);
+        }
        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
        {
            return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args);
@@ -58,6 +103,15 @@ namespace WixToolset.Core.Burn
        public enum Ids
        {
+            DiscardedRollbackBoundary = 1129,
+            DiscouragedAllUsersValue = 1133,
+            ImplicitlyPerUser = 1134,
+            PerUserButForcingPerMachine = 1135,
+            NoPerMachineDependencies = 1140,
+            DownloadUrlNotSupportedForAttachedContainers = 1141,
+            MsiTransactionLimitations = 1151,
+            DiscardedRollbackBoundary2 = 1160,
+            InvalidWixVersion = 1162,
            AttachedContainerPayloadCollision = 8500,
            AttachedContainerPayloadCollision2 = 8501,
            EmptyContainer = 8502,
diff --git a/src/wix/WixToolset.Core.Native/NativeWarnings.cs b/src/wix/WixToolset.Core.Native/NativeWarnings.cs
new file mode 100644
index 00000000..215f7a40
--- /dev/null
+++ b/src/wix/WixToolset.Core.Native/NativeWarnings.cs
@@ -0,0 +1,24 @@
+// 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.Core.Native
+{
+    using WixToolset.Data;
+    internal static class NativeWarnings
+    {
+        public static Message ValidationFailedDueToSystemPolicy()
+        {
+            return Message(null, Ids.ValidationFailedDueToSystemPolicy, "Validation could not run due to system policy. To eliminate this warning, run the process as admin or suppress ICE validation.");
+        }
+        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
+        {
+            return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args);
+        }
+        public enum Ids
+        {
+            ValidationFailedDueToSystemPolicy = 1105,
+        }
+    }
+}
diff --git a/src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs b/src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs
index 434b0887..b62cb225 100644
--- a/src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs
+++ b/src/wix/WixToolset.Core.Native/WindowsInstallerValidator.cs
@@ -258,7 +258,7 @@ namespace WixToolset.Core.Native
                    }
                    else if (0x659 == e.NativeErrorCode)
                    {
-                        this.Callback.WriteMessage(WarningMessages.ValidationFailedDueToSystemPolicy());
+                        this.Callback.WriteMessage(NativeWarnings.ValidationFailedDueToSystemPolicy());
                    }
                    else
                    {
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index ad0b2425..f95dd0ac 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -117,7 +117,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
            {
                processorCount = 1;
-                this.Messaging.Write(WarningMessages.InvalidEnvironmentVariable("NUMBER_OF_PROCESSORS", Environment.ProcessorCount.ToString(), processorCount.ToString()));
+                this.Messaging.Write(WindowsInstallerBackendWarnings.InvalidEnvironmentVariable("NUMBER_OF_PROCESSORS", Environment.ProcessorCount.ToString(), processorCount.ToString()));
            }
            // If the cabbing thread count was provided, and it isn't more than double the number of processors, use it.
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
index acfaa793..0de70e00 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
@@ -133,7 +133,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                var cabinetName = mediaSymbol.Cabinet.TrimStart('#');
                // If building a patch, remind them to run -p for torch.
-                this.Messaging.Write(WarningMessages.EmptyCabinet(mediaSymbol.SourceLineNumbers, cabinetName, OutputType.Patch == data.Type));
+                this.Messaging.Write(WindowsInstallerBackendWarnings.EmptyCabinet(mediaSymbol.SourceLineNumbers, cabinetName, OutputType.Patch == data.Type));
            }
            var resolvedCabinet = this.cabinetResolver.ResolveCabinet(intermediateCabinetPath, fileFacades);
@@ -160,7 +160,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                }
                catch (Exception e)
                {
-                    this.Messaging.Write(WarningMessages.CannotUpdateCabCache(mediaSymbol.SourceLineNumbers, resolvedCabinet.Path, e.Message));
+                    this.Messaging.Write(WindowsInstallerBackendWarnings.CannotUpdateCabCache(mediaSymbol.SourceLineNumbers, resolvedCabinet.Path, e.Message));
                }
            }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreatePatchSubStoragesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreatePatchSubStoragesCommand.cs
index 8b77a8bc..355661bf 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreatePatchSubStoragesCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreatePatchSubStoragesCommand.cs
@@ -386,7 +386,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                    if (RowOperation.Modify == row.Operation &&
                        "ProductCode".Equals(row.FieldAsString(0), StringComparison.Ordinal))
                    {
-                        this.Messaging.Write(WarningMessages.MajorUpgradePatchNotRecommended());
+                        this.Messaging.Write(WindowsInstallerBackendWarnings.MajorUpgradePatchNotRecommended());
                    }
                }
            }
@@ -506,7 +506,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                            if (!foundRemoveFileEntry)
                            {
-                                this.Messaging.Write(WarningMessages.InvalidRemoveFile(row.SourceLineNumbers, fileId, componentId));
+                                this.Messaging.Write(WindowsInstallerBackendWarnings.InvalidRemoveFile(row.SourceLineNumbers, fileId, componentId));
                            }
                        }
                    }
@@ -567,7 +567,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                        // Features may not be present if not referenced
                        if (!featureOps.ContainsKey(feature_) || RowOperation.Add != (RowOperation)featureOps[feature_])
                        {
-                            this.Messaging.Write(WarningMessages.NewComponentAddedToExistingFeature(row.SourceLineNumbers, component_, feature_, transformPath));
+                            this.Messaging.Write(WindowsInstallerBackendWarnings.NewComponentAddedToExistingFeature(row.SourceLineNumbers, component_, feature_, transformPath));
                        }
                    }
                }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
index e565bbb5..d154831e 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
@@ -553,7 +553,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                    {
                        if (directoryId.StartsWith(standardDirectoryId, StringComparison.Ordinal))
                        {
-                            this.Messaging.Write(WarningMessages.StandardDirectoryConflictInMergeModule(symbol.SourceLineNumbers, directoryId, standardDirectoryId));
+                            this.Messaging.Write(WindowsInstallerBackendWarnings.StandardDirectoryConflictInMergeModule(symbol.SourceLineNumbers, directoryId, standardDirectoryId));
                        }
                    }
                }
@@ -1396,10 +1396,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
        {
            foreach (var conflicts in this.GeneratedShortNames.Values.Where(l => l.Count > 1))
            {
-                this.Messaging.Write(WarningMessages.GeneratedShortFileNameConflict(conflicts[0].SourceLineNumbers, conflicts[0].ShortName));
+                this.Messaging.Write(WindowsInstallerBackendWarnings.GeneratedShortFileNameConflict(conflicts[0].SourceLineNumbers, conflicts[0].ShortName));
                for (var i = 1; i < conflicts.Count; ++i)
                {
-                    this.Messaging.Write(WarningMessages.GeneratedShortFileNameConflict2(conflicts[i].SourceLineNumbers));
+                    this.Messaging.Write(WindowsInstallerBackendWarnings.GeneratedShortFileNameConflict2(conflicts[i].SourceLineNumbers));
                }
            }
        }
@@ -1430,7 +1430,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                        {
                            foreach (var row in table.Rows)
                            {
-                                this.Messaging.Write(WarningMessages.DangerousTableInMergeModule(row.SourceLineNumbers, table.Name));
+                                this.Messaging.Write(WindowsInstallerBackendWarnings.DangerousTableInMergeModule(row.SourceLineNumbers, table.Name));
                            }
                        }
                        else if (31 < table.Name.Length)
@@ -1474,7 +1474,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                        {
                            foreach (var row in table.Rows)
                            {
-                                this.Messaging.Write(WarningMessages.UnexpectedTableInProduct(row.SourceLineNumbers, table.Name));
+                                this.Messaging.Write(WindowsInstallerBackendWarnings.UnexpectedTableInProduct(row.SourceLineNumbers, table.Name));
                            }
                        }
                        else if (31 < table.Name.Length)
@@ -1508,7 +1508,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                            }
                            else if (keyTableDefinition.Columns[keyColumnIndex - 1].ModularizeType != columnDefinition.ModularizeType && ColumnModularizeType.CompanionFile != columnDefinition.ModularizeType)
                            {
-                                this.Messaging.Write(WarningMessages.CollidingModularizationTypes(tableDefinition.Name, columnDefinition.Name, columnDefinition.KeyTable, keyColumnIndex, columnDefinition.ModularizeType.ToString(), keyTableDefinition.Columns[keyColumnIndex - 1].ModularizeType.ToString()));
+                                this.Messaging.Write(WindowsInstallerBackendWarnings.CollidingModularizationTypes(tableDefinition.Name, columnDefinition.Name, columnDefinition.KeyTable, keyColumnIndex, columnDefinition.ModularizeType.ToString(), keyTableDefinition.Columns[keyColumnIndex - 1].ModularizeType.ToString()));
                            }
                        }
                        // else - ignore missing table definitions as that error is caught in other places
@@ -1540,7 +1540,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                {
                    foreach (var row in isolatedComponentTable.Rows)
                    {
-                        this.Messaging.Write(WarningMessages.TableIncompatibleWithInstallerVersion(row.SourceLineNumbers, "IsolatedComponent", outputInstallerVersion));
+                        this.Messaging.Write(WindowsInstallerBackendWarnings.TableIncompatibleWithInstallerVersion(row.SourceLineNumbers, "IsolatedComponent", outputInstallerVersion));
                    }
                }
            }
@@ -1554,7 +1554,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                    {
                        if (null != row[12] || null != row[13] || null != row[14] || null != row[15])
                        {
-                            this.Messaging.Write(WarningMessages.ColumnsIncompatibleWithInstallerVersion(row.SourceLineNumbers, "Shortcut", outputInstallerVersion));
+                            this.Messaging.Write(WindowsInstallerBackendWarnings.ColumnsIncompatibleWithInstallerVersion(row.SourceLineNumbers, "Shortcut", outputInstallerVersion));
                        }
                    }
                }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
index 5e360329..6566fbf0 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
@@ -151,7 +151,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                            var moduleInstallerVersion = Convert.ToInt32(moduleInstallerVersionString, CultureInfo.InvariantCulture);
                            if (moduleInstallerVersion > this.OutputInstallerVersion)
                            {
-                                this.Messaging.Write(WarningMessages.InvalidHigherInstallerVersionInModule(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, moduleInstallerVersion, this.OutputInstallerVersion));
+                                this.Messaging.Write(WindowsInstallerBackendWarnings.InvalidHigherInstallerVersionInModule(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, moduleInstallerVersion, this.OutputInstallerVersion));
                            }
                        }
                        catch (FormatException)
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/FinalizeComponentGuids.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/FinalizeComponentGuids.cs
index 180ab3d6..aa02a04c 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/FinalizeComponentGuids.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/FinalizeComponentGuids.cs
@@ -230,7 +230,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                    if (allComponentsHaveConditions)
                    {
-                        this.Messaging.Write(WarningMessages.DuplicateComponentGuidsMustHaveMutuallyExclusiveConditions(componentSymbol.SourceLineNumbers, componentSymbol.Id.Id, componentSymbol.ComponentId, type, path));
+                        this.Messaging.Write(WindowsInstallerBackendWarnings.DuplicateComponentGuidsMustHaveMutuallyExclusiveConditions(componentSymbol.SourceLineNumbers, componentSymbol.Id.Id, componentSymbol.ComponentId, type, path));
                    }
                    else
                    {
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs
index 24837d39..d3d3db9f 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs
@@ -175,12 +175,12 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                                    this.Messaging.Write(WindowsInstallerBackendErrors.MergeLanguageUnsupported(wixMergeRow.SourceLineNumbers, mergeError.Language, wixMergeRow.SourceFile));
                                    break;
                                case MsmErrorType.msmErrorResequenceMerge:
-                                    this.Messaging.Write(WarningMessages.MergeRescheduledAction(wixMergeRow.SourceLineNumbers, mergeError.DatabaseTable, databaseKeys.ToString(), wixMergeRow.SourceFile));
+                                    this.Messaging.Write(WindowsInstallerBackendWarnings.MergeRescheduledAction(wixMergeRow.SourceLineNumbers, mergeError.DatabaseTable, databaseKeys.ToString(), wixMergeRow.SourceFile));
                                    break;
                                case MsmErrorType.msmErrorTableMerge:
                                    if ("_Validation" != mergeError.DatabaseTable) // ignore merge errors in the _Validation table
                                    {
-                                        this.Messaging.Write(WarningMessages.MergeTableFailed(wixMergeRow.SourceLineNumbers, mergeError.DatabaseTable, databaseKeys.ToString(), wixMergeRow.SourceFile));
+                                        this.Messaging.Write(WindowsInstallerBackendWarnings.MergeTableFailed(wixMergeRow.SourceLineNumbers, mergeError.DatabaseTable, databaseKeys.ToString(), wixMergeRow.SourceFile));
                                    }
                                    break;
                                case MsmErrorType.msmErrorPlatformMismatch:
@@ -238,7 +238,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                        {
                            if (null != record)
                            {
-                                this.Messaging.Write(WarningMessages.SuppressMergedAction(suppressAction.Action, tableName));
+                                this.Messaging.Write(WindowsInstallerBackendWarnings.SuppressMergedAction(suppressAction.Action, tableName));
                                view.Modify(ModifyView.Delete, record);
                            }
                        }
@@ -257,7 +257,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                    {
                        foreach (var resultRecord in view.Records)
                        {
-                            this.Messaging.Write(WarningMessages.SuppressMergedAction(resultRecord.GetString(1), tableName));
+                            this.Messaging.Write(WindowsInstallerBackendWarnings.SuppressMergedAction(resultRecord.GetString(1), tableName));
                        }
                    }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
index 28fa0533..caa3c720 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
@@ -145,10 +145,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                {
                    if (requiredActionSymbol.Overridable || requiredActionSymbol.Id.Access == AccessModifier.Virtual)
                    {
-                        this.Messaging.Write(WarningMessages.SuppressAction(suppressActionSymbol.SourceLineNumbers, suppressActionSymbol.Action, suppressActionSymbol.SequenceTable.ToString()));
+                        this.Messaging.Write(WindowsInstallerBackendWarnings.SuppressAction(suppressActionSymbol.SourceLineNumbers, suppressActionSymbol.Action, suppressActionSymbol.SequenceTable.ToString()));
                        if (null != requiredActionSymbol.SourceLineNumbers)
                        {
-                            this.Messaging.Write(WarningMessages.SuppressAction2(requiredActionSymbol.SourceLineNumbers));
+                            this.Messaging.Write(WindowsInstallerBackendWarnings.SuppressAction2(requiredActionSymbol.SourceLineNumbers));
                        }
                        requiredActionSymbols.Remove(key);
@@ -258,10 +258,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                        {
                            if (sequenceScheduledActionSymbol.Sequence == actionSymbol.Sequence)
                            {
-                                this.Messaging.Write(WarningMessages.ActionSequenceCollision(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action, sequenceScheduledActionSymbol.Action, actionSymbol.Sequence ?? 0));
+                                this.Messaging.Write(WindowsInstallerBackendWarnings.ActionSequenceCollision(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action, sequenceScheduledActionSymbol.Action, actionSymbol.Sequence ?? 0));
                                if (null != sequenceScheduledActionSymbol.SourceLineNumbers)
                                {
-                                    this.Messaging.Write(WarningMessages.ActionSequenceCollision2(sequenceScheduledActionSymbol.SourceLineNumbers));
+                                    this.Messaging.Write(WindowsInstallerBackendWarnings.ActionSequenceCollision2(sequenceScheduledActionSymbol.SourceLineNumbers));
                                }
                            }
                        }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
index b6ff5fbd..929a348b 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
@@ -241,14 +241,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                        // for unversioned file. That's allowed but generally a dangerous thing to do so let's point that out to the user.
                        if (!this.AllFileFacades.Any(r => facade.Version.Equals(r.Id, StringComparison.Ordinal)))
                        {
-                            this.Messaging.Write(WarningMessages.DefaultVersionUsedForUnversionedFile(facade.SourceLineNumber, facade.Version, facade.Id));
+                            this.Messaging.Write(WindowsInstallerBackendWarnings.DefaultVersionUsedForUnversionedFile(facade.SourceLineNumber, facade.Version, facade.Id));
                        }
                    }
                    else
                    {
                        if (null != facade.Language)
                        {
-                            this.Messaging.Write(WarningMessages.DefaultLanguageUsedForUnversionedFile(facade.SourceLineNumber, facade.Language, facade.Id));
+                            this.Messaging.Write(WindowsInstallerBackendWarnings.DefaultLanguageUsedForUnversionedFile(facade.SourceLineNumber, facade.Language, facade.Id));
                        }
                        int[] hash;
@@ -303,7 +303,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                    if (!String.IsNullOrEmpty(facade.Language) && String.IsNullOrEmpty(language))
                    {
-                        this.Messaging.Write(WarningMessages.DefaultLanguageUsedForVersionedFile(facade.SourceLineNumber, facade.Language, facade.Id));
+                        this.Messaging.Write(WindowsInstallerBackendWarnings.DefaultLanguageUsedForVersionedFile(facade.SourceLineNumber, facade.Language, facade.Id));
                    }
                    else // override the default provided by the user (usually nothing) with the actual language from the file itself.
                    {
@@ -420,7 +420,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                // check for null value (this can occur when grabbing the file version from an assembly without one)
                if (String.IsNullOrEmpty(value))
                {
-                    this.Messaging.Write(WarningMessages.NullMsiAssemblyNameValue(facade.SourceLineNumber, facade.ComponentRef, name));
+                    this.Messaging.Write(WindowsInstallerBackendWarnings.NullMsiAssemblyNameValue(facade.SourceLineNumber, facade.ComponentRef, name));
                }
                else
                {
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
index 56f32308..06dedc17 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
@@ -440,7 +440,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                // Make sure all changes to non keypath files also had a change in the keypath.
                if (!componentWithChangedKeyPath.ContainsKey(componentFile.Key) && componentKeyPath.TryGetValue(componentFile.Key, out var keyPath))
                {
-                    this.Messaging.Write(WarningMessages.UpdateOfNonKeyPathFile(componentFile.Value, componentFile.Key, keyPath));
+                    this.Messaging.Write(WindowsInstallerBackendWarnings.UpdateOfNonKeyPathFile(componentFile.Value, componentFile.Key, keyPath));
                }
            }
        }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index dc3ee06d..ac998cf0 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -387,7 +387,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                }
                catch (ArgumentException) // action/dialog is not valid for this sequence
                {
-                    this.Messaging.Write(WarningMessages.IllegalActionInSequence(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action));
+                    this.Messaging.Write(WindowsInstallerBackendWarnings.IllegalActionInSequence(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action));
                }
            }
        }
@@ -500,7 +500,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                    return xStandardAction;
                default:
-                    this.Messaging.Write(WarningMessages.UnknownAction(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action));
+                    this.Messaging.Write(WindowsInstallerBackendWarnings.UnknownAction(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action));
                    return null;
            }
@@ -523,7 +523,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
            if ((null != actionSymbol.Before || null != actionSymbol.After) && 0 == actionSymbol.Sequence)
            {
-                this.Messaging.Write(WarningMessages.DecompiledStandardActionRelativelyScheduledInModule(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action));
+                this.Messaging.Write(WindowsInstallerBackendWarnings.DecompiledStandardActionRelativelyScheduledInModule(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action));
            }
            else if (actionSymbol.Sequence.HasValue)
            {
@@ -694,7 +694,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                            }
                            else
                            {
-                                this.Messaging.Write(WarningMessages.IllegalRegistryKeyPath(row.SourceLineNumbers, "Component", keyPath));
+                                this.Messaging.Write(WindowsInstallerBackendWarnings.IllegalRegistryKeyPath(row.SourceLineNumbers, "Component", keyPath));
                            }
                        }
                        else
@@ -1191,7 +1191,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                {
                    if (addedProgIds.TryGetValue(xProgId, out var progid))
                    {
-                        this.Messaging.Write(WarningMessages.TooManyProgIds(row.SourceLineNumbers, row.FieldAsString(0), row.FieldAsString(3), progid));
+                        this.Messaging.Write(WindowsInstallerBackendWarnings.TooManyProgIds(row.SourceLineNumbers, row.FieldAsString(0), row.FieldAsString(3), progid));
                    }
                    else
                    {
@@ -2427,7 +2427,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                        this.DecompileActionTextTable(table);
                        break;
                    case "AdvtUISequence":
-                        this.Messaging.Write(WarningMessages.DeprecatedTable(table.Name));
+                        this.Messaging.Write(WindowsInstallerBackendWarnings.DeprecatedTable(table.Name));
                        break;
                    case "AppId":
                        this.DecompileAppIdTable(table);
@@ -2556,7 +2556,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                        this.DecompileMIMETable(table);
                        break;
                    case "ModuleAdvtUISequence":
-                        this.Messaging.Write(WarningMessages.DeprecatedTable(table.Name));
+                        this.Messaging.Write(WindowsInstallerBackendWarnings.DeprecatedTable(table.Name));
                        break;
                    case "ModuleComponents":
                        // handled by DecompileComponentTable (since the ModuleComponents table
@@ -2746,7 +2746,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                case "ModuleSubstitution":
                    if (OutputType.Module != output.Type)
                    {
-                        this.Messaging.Write(WarningMessages.SkippingMergeModuleTable(output.SourceLineNumbers, tableName));
+                        this.Messaging.Write(WindowsInstallerBackendWarnings.SkippingMergeModuleTable(output.SourceLineNumbers, tableName));
                        return false;
                    }
                    else
@@ -2772,7 +2772,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                case "MsiPatchSequence":
                case "Patch":
                case "PatchPackage":
-                    this.Messaging.Write(WarningMessages.PatchTable(output.SourceLineNumbers, tableName));
+                    this.Messaging.Write(WindowsInstallerBackendWarnings.PatchTable(output.SourceLineNumbers, tableName));
                    return false;
                case "_SummaryInformation":
                    return true;
@@ -3549,7 +3549,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
        {
            if (0 < table.Rows.Count || this.SuppressDroppingEmptyTables)
            {
-                this.Messaging.Write(WarningMessages.DecompilingAsCustomTable(table.Rows[0].SourceLineNumbers, table.Name));
+                this.Messaging.Write(WindowsInstallerBackendWarnings.DecompilingAsCustomTable(table.Rows[0].SourceLineNumbers, table.Name));
                var xCustomTable = new XElement(Names.CustomTableElement,
                    new XAttribute("Id", table.Name));
@@ -3896,7 +3896,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                        }
                        break;
                    case WindowsInstallerConstants.MsidbCustomActionTypeInstall:
-                        this.Messaging.Write(WarningMessages.NestedInstall(row.SourceLineNumbers, table.Name, row.Fields[1].Column.Name, row[1]));
+                        this.Messaging.Write(WindowsInstallerBackendWarnings.NestedInstall(row.SourceLineNumbers, table.Name, row.Fields[1].Column.Name, row[1]));
                        continue;
                    default:
                        this.Messaging.Write(WarningMessages.IllegalColumnValue(row.SourceLineNumbers, table.Name, row.Fields[1].Column.Name, row[1]));
@@ -4121,7 +4121,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                    if (id == "TARGETDIR" && names[0] != "SourceDir")
                    {
-                        this.Messaging.Write(WarningMessages.TargetDirCorrectedDefaultDir());
+                        this.Messaging.Write(WindowsInstallerBackendWarnings.TargetDirCorrectedDefaultDir());
                        xDirectory.SetAttributeValue("Name", "SourceDir");
                    }
                    else
@@ -4471,7 +4471,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                if (WindowsInstallerConstants.MsidbFeatureAttributesDisallowAdvertise == (attributes & WindowsInstallerConstants.MsidbFeatureAttributesDisallowAdvertise) &&
                    WindowsInstallerConstants.MsidbFeatureAttributesNoUnsupportedAdvertise == (attributes & WindowsInstallerConstants.MsidbFeatureAttributesNoUnsupportedAdvertise))
                {
-                    this.Messaging.Write(WarningMessages.InvalidAttributeCombination(row.SourceLineNumbers, "msidbFeatureAttributesDisallowAdvertise", "msidbFeatureAttributesNoUnsupportedAdvertise", "Feature.AllowAdvertiseType", "no"));
+                    this.Messaging.Write(WindowsInstallerBackendWarnings.InvalidAttributeCombination(row.SourceLineNumbers, "msidbFeatureAttributesDisallowAdvertise", "msidbFeatureAttributesNoUnsupportedAdvertise", "Feature.AllowAdvertiseType", "no"));
                    feature.SetAttributeValue("AllowAdvertise", "no");
                }
                else if (WindowsInstallerConstants.MsidbFeatureAttributesDisallowAdvertise == (attributes & WindowsInstallerConstants.MsidbFeatureAttributesDisallowAdvertise))
@@ -6729,7 +6729,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                    if (65536 == version)
                    {
-                        this.Messaging.Write(WarningMessages.PossiblyIncorrectTypelibVersion(row.SourceLineNumbers, id));
+                        this.Messaging.Write(WindowsInstallerBackendWarnings.PossiblyIncorrectTypelibVersion(row.SourceLineNumbers, id));
                    }
                    xTypeLib.SetAttributeValue("MajorVersion", (version & 0xFFFF00) >> 8);
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
index bd1b31e0..b8f64cb7 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
@@ -270,7 +270,7 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe
                // If we did find external cabs but not all of them were signed, give a warning
                if (foundUnsignedExternals)
                {
-                    this.Messaging.Write(WarningMessages.ExternalCabsAreNotSigned(this.InputPath));
+                    this.Messaging.Write(WindowsInstallerBackendWarnings.ExternalCabsAreNotSigned(this.InputPath));
                }
                if (shouldCommit)
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
index ac6a6ab3..95a6a223 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindDatabaseCommand.cs
@@ -195,7 +195,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                                                if (!success)
                                                {
-                                                    this.Messaging.Write(WarningMessages.BadColumnDataIgnored(row.SourceLineNumbers, Convert.ToString(intValue, CultureInfo.InvariantCulture), tableName, row.Fields[i].Column.Name));
+                                                    this.Messaging.Write(WindowsInstallerBackendWarnings.BadColumnDataIgnored(row.SourceLineNumbers, Convert.ToString(intValue, CultureInfo.InvariantCulture), tableName, row.Fields[i].Column.Name));
                                                }
                                                break;
                                            case ColumnType.Object:
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs
index 169a1e29..7d82cfca 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs
@@ -119,7 +119,7 @@ namespace WixToolset.Core.WindowsInstaller.Validate
                    this.Messaging.Write(WindowsInstallerBackendErrors.ValidationError(messageSourceLineNumbers, message.IceName, message.Description));
                    break;
                case ValidationMessageType.Warning:
-                    this.Messaging.Write(WarningMessages.ValidationWarning(messageSourceLineNumbers, message.IceName, message.Description));
+                    this.Messaging.Write(WindowsInstallerBackendWarnings.ValidationWarning(messageSourceLineNumbers, message.IceName, message.Description));
                    break;
                case ValidationMessageType.Info:
                    this.Messaging.Write(VerboseMessages.ValidationInfo(message.IceName, message.Description));
@@ -184,7 +184,7 @@ namespace WixToolset.Core.WindowsInstaller.Validate
                            }
                            catch (ArgumentException)
                            {
-                                this.Messaging.Write(WarningMessages.DuplicatePrimaryKey(row.SourceLineNumbers, primaryKey, table.Name));
+                                this.Messaging.Write(WindowsInstallerBackendWarnings.DuplicatePrimaryKey(row.SourceLineNumbers, primaryKey, table.Name));
                            }
                        }
                    }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendWarnings.cs b/src/wix/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendWarnings.cs
index bc61c59c..a549c8cd 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendWarnings.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendWarnings.cs
@@ -11,6 +11,236 @@ namespace WixToolset.Core.WindowsInstaller
            return Message(sourceLineNumbers, Ids.LongPatchBaselineIdTrimmed, "The PatchBaseline/@Id='{0}' is too long. It is recommended to use short identifiers like 'RTM' and 'SP1'. The identifier has been trimmed to '{1}' so the patch can be created.", baseTransformName, trimmedTransformName);
        }
+        public static Message ActionSequenceCollision(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName1, string actionName2, int sequenceNumber)
+        {
+            return Message(sourceLineNumbers, Ids.ActionSequenceCollision, "The {0} table contains actions '{1}' and '{2}' which both have the same sequence number {3}. Please change the sequence number for one of these actions to avoid an ICE warning.", sequenceTableName, actionName1, actionName2, sequenceNumber);
+        }
+        public static Message ActionSequenceCollision2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.ActionSequenceCollision2, "The location of the action related to previous warning.");
+        }
+        public static Message BadColumnDataIgnored(SourceLineNumber sourceLineNumbers, string value, string tableName, string columnName)
+        {
+            return Message(sourceLineNumbers, Ids.BadColumnDataIgnored, "The value '{0}' in table '{1}', column '{2}' is invalid according to the column's validation information. The decompiled output includes a best-effort representation of this value.", value, tableName, columnName);
+        }
+        public static Message CannotUpdateCabCache(SourceLineNumber sourceLineNumbers, string cabinetPath, string detail)
+        {
+            return Message(sourceLineNumbers, Ids.CannotUpdateCabCache, "Cannot update the timestamp of cached cabinet: '{0}'. If the timestamp is not updated, the build may rebuild more than is necessary. To fix the issue, ensure that the cabinet file is writable, error: {1}", cabinetPath, detail);
+        }
+        public static Message ColumnsIncompatibleWithInstallerVersion(SourceLineNumber sourceLineNumbers, string tableName, int packageInstallerVersion)
+        {
+            return Message(sourceLineNumbers, Ids.ColumnsIncompatibleWithInstallerVersion, "Table '{0}' uses columns that require a version of Windows Installer greater than specified in your package ('{1}').", tableName, packageInstallerVersion);
+        }
+        public static Message DangerousTableInMergeModule(SourceLineNumber sourceLineNumbers, string tableName)
+        {
+            return Message(sourceLineNumbers, Ids.DangerousTableInMergeModule, "Merge modules should not contain the '{0}' table because all merge conflicts cannot avoided. However, this warning can be suppressed if all of the consumers of the Merge Module agree to not duplicate identifiers in the '{0}' table.", tableName);
+        }
+        public static Message DecompiledStandardActionRelativelyScheduledInModule(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
+        {
+            return Message(sourceLineNumbers, Ids.DecompiledStandardActionRelativelyScheduledInModule, "The {0} table contains a standard action '{1}' that does not have a sequence number specified. A value in the Sequence column is required for standard actions in a merge module. Remove the action from the decompiled authoring to have WiX automatically sequence it.", sequenceTableName, actionName);
+        }
+        public static Message DecompilingAsCustomTable(SourceLineNumber sourceLineNumbers, string tableName)
+        {
+            return Message(sourceLineNumbers, Ids.DecompilingAsCustomTable, "The {0} table is being decompiled as a custom table.", tableName);
+        }
+        public static Message DefaultLanguageUsedForUnversionedFile(SourceLineNumber sourceLineNumbers, string language, string fileId)
+        {
+            return Message(sourceLineNumbers, Ids.DefaultLanguageUsedForUnversionedFile, "The DefaultLanguage '{0}' was used for file '{1}' which has no language or version. For unversioned files, specifying a value for DefaultLanguage is not neccessary and it will not be used when determining file versions. Remove the DefaultLanguage attribute to eliminate this warning.", language, fileId);
+        }
+        public static Message DefaultLanguageUsedForVersionedFile(SourceLineNumber sourceLineNumbers, string language, string fileId)
+        {
+            return Message(sourceLineNumbers, Ids.DefaultLanguageUsedForVersionedFile, "The DefaultLanguage '{0}' was used for file '{1}' which has no language. Specifying a language that is different from the actual file may result in unexpected versioning behavior during a repair or while patching. Either specify a value for DefaultLanguage or put the language in the version information resource to eliminate this warning.", language, fileId);
+        }
+        public static Message DefaultVersionUsedForUnversionedFile(SourceLineNumber sourceLineNumbers, string version, string fileId)
+        {
+            return Message(sourceLineNumbers, Ids.DefaultVersionUsedForUnversionedFile, "The DefaultVersion '{0}' was used for file '{1}' which has no version. No entry for this file will be placed in the MsiFileHash table. For unversioned files, specifying a version that is different from the actual file may result in unexpected versioning behavior during a repair or while patching. Version the resource to eliminate this warning.", version, fileId);
+        }
+        public static Message DeprecatedTable(string tableName)
+        {
+            return Message(null, Ids.DeprecatedTable, "The {0} table is not supported by the WiX toolset because it has been deprecated by the Windows Installer team. Any information in this table will be left out of the decompiled output.", tableName);
+        }
+        public static Message DuplicateComponentGuidsMustHaveMutuallyExclusiveConditions(SourceLineNumber sourceLineNumbers, string componentId, string guid, string type, string keyPath)
+        {
+            return Message(sourceLineNumbers, Ids.DuplicateComponentGuidsMustHaveMutuallyExclusiveConditions, "Component/@Id='{0}' with {2} '{3}' has a @Guid value '{1}' that duplicates another component in this package. This is not officially supported by Windows Installer and cannot be used when creating patches. It otherwise works as long as all components with the same GUID have mutually-exclusive conditions. It is recommended to give each component its own unique GUID.", componentId, guid, type, keyPath);
+        }
+        public static Message DuplicatePrimaryKey(SourceLineNumber sourceLineNumbers, string primaryKey, string tableName)
+        {
+            return Message(sourceLineNumbers, Ids.DuplicatePrimaryKey, "The primary key '{0}' is duplicated in table '{1}' and will be ignored. Please remove one of the entries or rename a part of the primary key to avoid the collision.", primaryKey, tableName);
+        }
+        public static Message EmptyCabinet(SourceLineNumber sourceLineNumbers, string cabinetName, bool isPatch)
+        {
+            if (isPatch)
+            {
+                return Message(sourceLineNumbers, Ids.EmptyCabinet, "The cabinet '{0}' does not contain any files. If this patch contains no files, this warning can likely be safely ignored. Otherwise, try passing -p to torch.exe when first building the transforms, or add a ComponentRef to your PatchFamily authoring to pull changed files into the cabinet.", cabinetName, isPatch);
+            }
+            return Message(sourceLineNumbers, Ids.EmptyCabinet, "The cabinet '{0}' does not contain any files. If this installation contains no files, this warning can likely be safely ignored. Otherwise, please add files to the cabinet or remove it.", cabinetName);
+        }
+        public static Message ExternalCabsAreNotSigned(string databaseFile)
+        {
+            return Message(null, Ids.ExternalCabsAreNotSigned, "The installer database '{0}' has external cabs, but at least one of them is not signed. Please ensure that all external cabs are signed, if you mean to sign them. If you don't mean to sign them, there is no need to inscribe the MSI as part of your build.", databaseFile);
+        }
+        public static Message GeneratedShortFileNameConflict(SourceLineNumber sourceLineNumbers, string shortFileName)
+        {
+            return Message(sourceLineNumbers, Ids.GeneratedShortFileNameConflict, "The short file name '{0}' was generated for multiple files that may be installed to the same directory. This could be due to conflicting long file names specified by the File/@Name attribute. If that is the case, please resolve the conflict in those attributes. Otherwise, please manually set the File/@ShortName attribute on the conflicting row to fix the collision. If one of the colliding files was added via a patch, that short file name should be specified manually to avoid disturbing the original short file name.", shortFileName);
+        }
+        public static Message GeneratedShortFileNameConflict2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.GeneratedShortFileNameConflict2, "The location of a conflicting generated short file name related to the previous warning.");
+        }
+        public static Message IllegalActionInSequence(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalActionInSequence, "The {0} table contains an action '{1}' which is not allowed in this table. If this is a standard action then it is not valid for this table, if it is a custom action or dialog then this table does not accept actions of that type. This action will be left out of the decompiled output.", sequenceTableName, actionName);
+        }
+        public static Message IllegalRegistryKeyPath(SourceLineNumber sourceLineNumbers, string componentName, string registryId)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalRegistryKeyPath, "Component '{0}' specifies an illegal registry keypath of '{1}'. Since this entry actually represents a registry key, not a registry value, it cannot be the keypath.", componentName, registryId);
+        }
+        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);
+        }
+        public static Message InvalidHigherInstallerVersionInModule(SourceLineNumber sourceLineNumbers, string moduleId, int moduleInstallerVersion, int packageInstallerVersion)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidHigherInstallerVersionInModule, "Merge module '{0}' has an installer version of {1} which is greater than the package's installer version of {2}. Merging a module with a higher installer version than the package it is being merged into can result in invalid values in the resulting msi. You must set the Package/@InstallerVersion attribute to {1} or greater to merge this merge module into your package.", moduleId, moduleInstallerVersion, packageInstallerVersion);
+        }
+        public static Message InvalidRemoveFile(SourceLineNumber sourceLineNumbers, string file, string component)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidRemoveFile, "File '{0}' was removed from component '{1}'. Removing a file from a component will not result in the file being removed by a patch. You should author a RemoveFile element in your component to remove the file from the installation if you want the file to be removed.", file, component);
+        }
+        public static Message MajorUpgradePatchNotRecommended()
+        {
+            return Message(null, Ids.MajorUpgradePatchNotRecommended, "Changing the ProductCode in a patch is not recommended because the patch cannot be uninstalled nor can it be sequenced along with other patches for the target package. See https://learn.microsoft.com/en-us/windows/win32/msi/applying-major-upgrades-by-patching-the-local-installation-of-the-product for more information.");
+        }
+        public static Message MergeRescheduledAction(SourceLineNumber sourceLineNumbers, string tableName, string actionName, string mergeModuleFile)
+        {
+            return Message(sourceLineNumbers, Ids.MergeRescheduledAction, "The {0} table contains an action '{1}' which cannot be merged from the merge module '{2}'. This action is likely colliding with an action in the database that is being created. The colliding action may have been authored in the database or merged in from another merge module. If this is a standard action, it is likely colliding due to a difference in the condition for the action in the database and merge module. If this is a custom action, it should only be declared in the database or one merge module.", tableName, actionName, mergeModuleFile);
+        }
+        public static Message MergeTableFailed(SourceLineNumber sourceLineNumbers, string tableName, string primaryKeys, string mergeModuleFile)
+        {
+            return Message(sourceLineNumbers, Ids.MergeTableFailed, "The {0} table contains a row with primary key(s) '{1}' which cannot be merged from the merge module '{2}'. This is likely due to collision of rows with the same primary key(s) (but other different values in other columns) between the database and the merge module.", tableName, primaryKeys, mergeModuleFile);
+        }
+        public static Message NestedInstall(SourceLineNumber sourceLineNumbers, string tableName, string columnName, object value)
+        {
+            return Message(sourceLineNumbers, Ids.NestedInstall, "The {0}.{1} column's value, '{2}', indicates a nested install. Nested installations are not supported by the WiX team. This action will be left out of the decompiled output.", tableName, columnName, value);
+        }
+        public static Message NewComponentAddedToExistingFeature(SourceLineNumber sourceLineNumbers, string component, string feature, string transformPath)
+        {
+            return Message(sourceLineNumbers, Ids.NewComponentAddedToExistingFeature, "Component '{0}' was added to feature '{1}' in the transform '{2}'. If you cannot guarantee that this feature will always be installed, you should consider adding new components to new top-level features to prevent prompts for source when installing this patch.", component, feature, transformPath);
+        }
+        public static Message NullMsiAssemblyNameValue(SourceLineNumber sourceLineNumbers, string componentName, string name)
+        {
+            return Message(sourceLineNumbers, Ids.NullMsiAssemblyNameValue, "The assembly in component '{0}' has a null or empty {1} assembly name value.", componentName, name);
+        }
+        public static Message PatchTable(SourceLineNumber sourceLineNumbers, string tableName)
+        {
+            return Message(sourceLineNumbers, Ids.PatchTable, "The {0} table is added to the install package by a transform from a patch package (.msp) and not authored directly into an install package (.msi). The information in this table will be left out of the decompiled output.", tableName);
+        }
+        public static Message PossiblyIncorrectTypelibVersion(SourceLineNumber sourceLineNumbers, string id)
+        {
+            return Message(sourceLineNumbers, Ids.PossiblyIncorrectTypelibVersion, "The Typelib table entry with Id '{0}' could have an incorrect version of '256.0'. InstallShield has a bug relating to the Typelib Version column: it will incorrectly set the value '65536' in to represent version '1.0'. However, this number actually corresponds to version '256.0'. This bug will not affect the typelib version that is registered during installation, however, it will prevent the Windows Installer from correctly identifying whether a typelib is already installed and lead to unnecessary reinstallations of the typelib.", id);
+        }
+        public static Message SkippingMergeModuleTable(SourceLineNumber sourceLineNumbers, string tableName)
+        {
+            return Message(sourceLineNumbers, Ids.SkippingMergeModuleTable, "The {0} table can only be represented in WiX for merge modules. The information in this table will be left out of the decompiled output.", tableName);
+        }
+        public static Message StandardDirectoryConflictInMergeModule(SourceLineNumber sourceLineNumbers, string directory, string standardDirectory)
+        {
+            return Message(sourceLineNumbers, Ids.StandardDirectoryConflictInMergeModule, "The Directory '{0}' starts with the same Id as the standard folder in Windows Installer '{1}'. A directory Id that begins with the same Id as a standard folder that is in an MSM may encounter a conflict when merging the MSM into an MSI. This may result in the contents of this merge module being installed to an unexpected location. To eliminate this warning, change your directory Id to not start with the same Id as any standard folders.", directory, standardDirectory);
+        }
+        public static Message SuppressAction(SourceLineNumber sourceLineNumbers, string action, string sequenceName)
+        {
+            return Message(sourceLineNumbers, Ids.SuppressAction, "The action '{0}' in the {1} table is being suppressed.", action, sequenceName);
+        }
+        public static Message SuppressAction2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.SuppressAction2, "The location of the suppressed action related to previous warning.");
+        }
+        public static Message SuppressMergedAction(string action, string sequenceName)
+        {
+            return Message(null, Ids.SuppressMergedAction, "The merged action '{0}' in the {1} table is being suppressed.", action, sequenceName);
+        }
+        public static Message TableIncompatibleWithInstallerVersion(SourceLineNumber sourceLineNumbers, string tableName, int packageInstallerVersion)
+        {
+            return Message(sourceLineNumbers, Ids.TableIncompatibleWithInstallerVersion, "Using table '{0}' requires a version of Windows Installer greater than specified in your package ('{1}').", tableName, packageInstallerVersion);
+        }
+        public static Message TargetDirCorrectedDefaultDir()
+        {
+            return Message(null, Ids.TargetDirCorrectedDefaultDir, "The Directory with Id 'TARGETDIR' must have the value 'SourceDir' in its 'DefaultDir' column. This has been automatically corrected for you in the decompiled output.");
+        }
+        public static Message TooManyProgIds(SourceLineNumber sourceLineNumbers, string clsId, string progId, string otherClsId)
+        {
+            return Message(sourceLineNumbers, Ids.TooManyProgIds, "Class '{0}' tried to use ProgId '{1}' which has already been associated with class '{2}'. This information will be left out of the decompiled output.", clsId, progId, otherClsId);
+        }
+        public static Message UnexpectedTableInProduct(SourceLineNumber sourceLineNumbers, string tableName)
+        {
+            return Message(sourceLineNumbers, Ids.UnexpectedTableInProduct, "An unexpected row in the '{0}' table was found in this package. Packages should not contain the '{0}' table.", tableName);
+        }
+        public static Message UnknownAction(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
+        {
+            return Message(sourceLineNumbers, Ids.UnknownAction, "The {0} table contains an action '{1}' which is not a known custom action, dialog, or standard action. This action will be left out of the decompiled output.", sequenceTableName, actionName);
+        }
+        public static Message UpdateOfNonKeyPathFile(string nonKeyPathFileId, string componentId, string keyPathFileId)
+        {
+            return Message(null, Ids.UpdateOfNonKeyPathFile, "File '{0}' in Component '{1}' was changed, but the KeyPath file '{2}' was not. This file will not be patched on the target system if the REINSTALLMODE does not contain 'A'. The KeyPath file should also be changed and included in your patch.", nonKeyPathFileId, componentId, keyPathFileId);
+        }
+        public static Message ValidationWarning(SourceLineNumber sourceLineNumbers, string ice, string message)
+        {
+            return Message(sourceLineNumbers, Ids.ValidationWarning, "{0}: {1}", ice, message);
+        }
+        public static Message CollidingModularizationTypes(string tableName, string columnName, string foreignTableName, int foreignColumnNumber, string modularizationType, string foreignModularizationType)
+        {
+            return Message(null, Ids.CollidingModularizationTypes, "The definition for the '{0}' table's '{1}' column is a foreign key relationship to the '{2}' table's column number {3}. The modularization types of the two column definitions differ: table '{0}' uses type {4} and table '{2}' uses type {5}. Change one of the modularization types so that they match.", tableName, columnName, foreignTableName, foreignColumnNumber, modularizationType, foreignModularizationType);
+        }
+        public static Message InvalidEnvironmentVariable(string environmentVariable, string value, string defaultValue)
+        {
+            return Message(null, Ids.InvalidEnvironmentVariable, "The {0} environment variable is set to an invalid value of '{1}'. The default value '{2}' will be used instead.", environmentVariable, value, defaultValue);
+        }
        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
        {
            return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args);
@@ -18,6 +248,51 @@ namespace WixToolset.Core.WindowsInstaller
        public enum Ids
        {
+            NestedInstall = 1004,
+            SuppressAction = 1008,
+            SuppressMergedAction = 1009,
+            TargetDirCorrectedDefaultDir = 1010,
+            UnknownAction = 1024,
+            PossiblyIncorrectTypelibVersion = 1048,
+            ActionSequenceCollision = 1050,
+            ActionSequenceCollision2 = 1051,
+            SuppressAction2 = 1052,
+            UnexpectedTableInProduct = 1053,
+            MergeRescheduledAction = 1055,
+            MergeTableFailed = 1056,
+            DecompiledStandardActionRelativelyScheduledInModule = 1057,
+            IllegalActionInSequence = 1058,
+            DecompilingAsCustomTable = 1060,
+            SkippingMergeModuleTable = 1062,
+            DeprecatedTable = 1065,
+            PatchTable = 1066,
+            GeneratedShortFileNameConflict = 1070,
+            GeneratedShortFileNameConflict2 = 1071,
+            DangerousTableInMergeModule = 1072,
+            ValidationWarning = 1076,
+            EmptyCabinet = 1079,
+            IllegalRegistryKeyPath = 1081,
+            InvalidRemoveFile = 1095,
+            UpdateOfNonKeyPathFile = 1097,
+            MajorUpgradePatchNotRecommended = 1099,
+            DefaultLanguageUsedForVersionedFile = 1101,
+            DefaultLanguageUsedForUnversionedFile = 1102,
+            DefaultVersionUsedForUnversionedFile = 1103,
+            InvalidHigherInstallerVersionInModule = 1104,
+            ColumnsIncompatibleWithInstallerVersion = 1106,
+            TableIncompatibleWithInstallerVersion = 1107,
+            NewComponentAddedToExistingFeature = 1110,
+            TooManyProgIds = 1114,
+            BadColumnDataIgnored = 1115,
+            NullMsiAssemblyNameValue = 1116,
+            InvalidAttributeCombination = 1117,
+            DuplicatePrimaryKey = 1119,
+            ExternalCabsAreNotSigned = 1122,
+            StandardDirectoryConflictInMergeModule = 1124,
+            CannotUpdateCabCache = 1131,
+            DuplicateComponentGuidsMustHaveMutuallyExclusiveConditions = 1137,
+            CollidingModularizationTypes = 1156,
+            InvalidEnvironmentVariable = 1157,
            LongPatchBaselineIdTrimmed = 7100,
        } // last available is 7499. 7500 is WindowsInstallerBackendErrors.
    }
diff --git a/src/wix/WixToolset.Core/Bind/TransferFilesCommand.cs b/src/wix/WixToolset.Core/Bind/TransferFilesCommand.cs
index e1ee0ef2..673428e2 100644
--- a/src/wix/WixToolset.Core/Bind/TransferFilesCommand.cs
+++ b/src/wix/WixToolset.Core/Bind/TransferFilesCommand.cs
@@ -166,7 +166,7 @@ namespace WixToolset.Core.Bind
                }
                catch (Exception e)
                {
-                    this.Messaging.Write(WarningMessages.UnableToResetAcls(e.Message));
+                    this.Messaging.Write(CompilerWarnings.UnableToResetAcls(e.Message));
                }
            }
        }
diff --git a/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs b/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
index 4883932a..d6df0e59 100644
--- a/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -719,7 +719,7 @@ namespace WixToolset.Core.CommandLine
                            {
                                if (value.Equals("embedded", StringComparison.OrdinalIgnoreCase))
                                {
-                                    this.Messaging.Write(WarningMessages.UnsupportedCommandLineArgumentValue(arg, value, "full"));
+                                    this.Messaging.Write(CompilerWarnings.UnsupportedCommandLineArgumentValue(arg, value, "full"));
                                    this.PdbType = PdbType.Full;
                                }
diff --git a/src/wix/WixToolset.Core/Common.cs b/src/wix/WixToolset.Core/Common.cs
index b4b734c8..0919109a 100644
--- a/src/wix/WixToolset.Core/Common.cs
+++ b/src/wix/WixToolset.Core/Common.cs
@@ -583,7 +583,7 @@ namespace WixToolset.Core
            {
                if (72 < value.Length)
                {
-                    messaging.Write(WarningMessages.IdentifierTooLong(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                    messaging.Write(CompilerWarnings.IdentifierTooLong(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
                }
                return value;
diff --git a/src/wix/WixToolset.Core/Compile/CompilerPayload.cs b/src/wix/WixToolset.Core/Compile/CompilerPayload.cs
index 40205f19..0da88ae4 100644
--- a/src/wix/WixToolset.Core/Compile/CompilerPayload.cs
+++ b/src/wix/WixToolset.Core/Compile/CompilerPayload.cs
@@ -179,7 +179,7 @@ namespace WixToolset.Core
                    if (YesNoDefaultType.Yes == this.Compressed)
                    {
-                        this.Core.Write(WarningMessages.RemotePayloadsMustNotAlsoBeCompressed(this.SourceLineNumbers, this.Element.Name.LocalName));
+                        this.Core.Write(CompilerWarnings.RemotePayloadsMustNotAlsoBeCompressed(this.SourceLineNumbers, this.Element.Name.LocalName));
                    }
                    this.Compressed = YesNoDefaultType.No;
@@ -195,7 +195,7 @@ namespace WixToolset.Core
            {
                if (this.Compressed == YesNoDefaultType.No)
                {
-                    this.Core.Write(WarningMessages.UxPayloadsOnlySupportEmbedding(this.SourceLineNumbers, this.SourceFile));
+                    this.Core.Write(CompilerWarnings.UxPayloadsOnlySupportEmbedding(this.SourceLineNumbers, this.SourceFile));
                }
                if (!String.IsNullOrEmpty(this.DownloadUrl))
diff --git a/src/wix/WixToolset.Core/Compiler.cs b/src/wix/WixToolset.Core/Compiler.cs
index 82ab0e1e..37aeb8f0 100644
--- a/src/wix/WixToolset.Core/Compiler.cs
+++ b/src/wix/WixToolset.Core/Compiler.cs
@@ -373,7 +373,7 @@ namespace WixToolset.Core
                    var id = value.Substring(start + 1, end - start - 1);
                    if (Common.IsIdentifier(id))
                    {
-                        this.Core.Write(WarningMessages.PropertyValueContainsPropertyReference(sourceLineNumbers, propertyId.Id, id));
+                        this.Core.Write(CompilerWarnings.PropertyValueContainsPropertyReference(sourceLineNumbers, propertyId.Id, id));
                    }
                    start = (end < value.Length) ? value.IndexOf('[', end + 1) : -1;
@@ -719,7 +719,7 @@ namespace WixToolset.Core
                {
                    if (18 < id.Id.Length)
                    {
-                        this.Core.Write(WarningMessages.IdentifierCannotBeModularized(sourceLineNumbers, node.Name.LocalName, "Id", id.Id, id.Id.Length, 18));
+                        this.Core.Write(CompilerWarnings.IdentifierCannotBeModularized(sourceLineNumbers, node.Name.LocalName, "Id", id.Id, id.Id.Length, 18));
                    }
                }
            }
@@ -799,7 +799,7 @@ namespace WixToolset.Core
                {
                    if (20 < id.Id.Length)
                    {
-                        this.Core.Write(WarningMessages.IdentifierCannotBeModularized(sourceLineNumbers, node.Name.LocalName, "Id", id.Id, id.Id.Length, 20));
+                        this.Core.Write(CompilerWarnings.IdentifierCannotBeModularized(sourceLineNumbers, node.Name.LocalName, "Id", id.Id, id.Id.Length, 20));
                    }
                }
            }
@@ -3152,7 +3152,7 @@ namespace WixToolset.Core
                if (null == destinationName && null == destinationDirectory && null == destinationProperty)
                {
-                    this.Core.Write(WarningMessages.CopyFileFileIdUseless(sourceLineNumbers));
+                    this.Core.Write(CompilerWarnings.CopyFileFileIdUseless(sourceLineNumbers));
                }
                if (!this.Core.EncounteredError)
@@ -3463,7 +3463,7 @@ namespace WixToolset.Core
            if (targetType == CustomActionTargetType.VBScript)
            {
-                this.Core.Write(WarningMessages.VBScriptIsDeprecated(sourceLineNumbers));
+                this.Core.Write(CompilerWarnings.VBScriptIsDeprecated(sourceLineNumbers));
            }
            // if we have an in-lined Script CustomAction ensure no source or target attributes were provided
@@ -3813,7 +3813,7 @@ namespace WixToolset.Core
                }
                else if (name.Equals(shortName, StringComparison.OrdinalIgnoreCase))
                {
-                    this.Core.Write(WarningMessages.DirectoryRedundantNames(sourceLineNumbers, node.Name.LocalName, "Name", "ShortName", name));
+                    this.Core.Write(CompilerWarnings.DirectoryRedundantNames(sourceLineNumbers, node.Name.LocalName, "Name", "ShortName", name));
                }
            }
@@ -3835,7 +3835,7 @@ namespace WixToolset.Core
                }
                else if (sourceName.Equals(shortSourceName, StringComparison.OrdinalIgnoreCase))
                {
-                    this.Core.Write(WarningMessages.DirectoryRedundantNames(sourceLineNumbers, node.Name.LocalName, "SourceName", "ShortSourceName", sourceName));
+                    this.Core.Write(CompilerWarnings.DirectoryRedundantNames(sourceLineNumbers, node.Name.LocalName, "SourceName", "ShortSourceName", sourceName));
                }
            }
@@ -4376,7 +4376,7 @@ namespace WixToolset.Core
                            title = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                            if ("PUT-FEATURE-TITLE-HERE" == title)
                            {
-                                this.Core.Write(WarningMessages.PlaceholderValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, title));
+                                this.Core.Write(CompilerWarnings.PlaceholderValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, title));
                            }
                            break;
                        case "TypicalDefault":
@@ -5939,7 +5939,7 @@ namespace WixToolset.Core
            // Using both ShortName and Name will not always work due to a Windows Installer bug.
            if (null != shortName && null != name)
            {
-                this.Core.Write(WarningMessages.FileSearchFileNameIssue(sourceLineNumbers, node.Name.LocalName, "ShortName", "Name"));
+                this.Core.Write(CompilerWarnings.FileSearchFileNameIssue(sourceLineNumbers, node.Name.LocalName, "ShortName", "Name"));
            }
            else if (null == shortName && null == name) // at least one name must be specified.
            {
@@ -7169,7 +7169,7 @@ namespace WixToolset.Core
                    // external cabinet files must use 8.3 filenames
                    if (!String.IsNullOrEmpty(cabinet) && !this.Core.IsValidLongFilename(cabinet) && !Common.ContainsValidBinderVariable(cabinet))
                    {
-                        this.Core.Write(WarningMessages.MediaExternalCabinetFilenameIllegal(sourceLineNumbers, node.Name.LocalName, "Cabinet", cabinet));
+                        this.Core.Write(CompilerWarnings.MediaExternalCabinetFilenameIllegal(sourceLineNumbers, node.Name.LocalName, "Cabinet", cabinet));
                    }
                }
            }
@@ -7309,7 +7309,7 @@ namespace WixToolset.Core
                                }
                                else if (!this.Core.IsValidLongFilename(exampleCabinetName) && !Common.ContainsValidBinderVariable(exampleCabinetName)) // ignore short names with wix variables because it rarely works out.
                                {
-                                    this.Core.Write(WarningMessages.MediaExternalCabinetFilenameIllegal(sourceLineNumbers, node.Name.LocalName, "CabinetTemplate", cabinetTemplate));
+                                    this.Core.Write(CompilerWarnings.MediaExternalCabinetFilenameIllegal(sourceLineNumbers, node.Name.LocalName, "CabinetTemplate", cabinetTemplate));
                                }
                            }
                            break;
@@ -7319,14 +7319,14 @@ namespace WixToolset.Core
                        case "DiskPrompt":
                            diskPrompt = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                            this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Property, "DiskPrompt"); // ensure the output has a DiskPrompt Property defined
-                            this.Core.Write(WarningMessages.ReservedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            this.Core.Write(CompilerWarnings.ReservedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
                            break;
                        case "EmbedCab":
                            embedCab = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
                            break;
                        case "VolumeLabel":
                            volumeLabel = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
-                            this.Core.Write(WarningMessages.ReservedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
+                            this.Core.Write(CompilerWarnings.ReservedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName));
                            break;
                        case "MaximumUncompressedMediaSize":
                            maximumUncompressedMediaSize = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, 1, Int32.MaxValue);
diff --git a/src/wix/WixToolset.Core/CompilerCore.cs b/src/wix/WixToolset.Core/CompilerCore.cs
index 5abd3f70..88b37ed8 100644
--- a/src/wix/WixToolset.Core/CompilerCore.cs
+++ b/src/wix/WixToolset.Core/CompilerCore.cs
@@ -716,7 +716,7 @@ namespace WixToolset.Core
                }
                else if (CompilerCore.IsAmbiguousFilename(value))
                {
-                    this.Write(WarningMessages.AmbiguousFileOrDirectoryName(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                    this.Write(CompilerWarnings.AmbiguousFileOrDirectoryName(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
                }
            }
diff --git a/src/wix/WixToolset.Core/CompilerWarnings.cs b/src/wix/WixToolset.Core/CompilerWarnings.cs
index 6685f2b2..8c302a6e 100644
--- a/src/wix/WixToolset.Core/CompilerWarnings.cs
+++ b/src/wix/WixToolset.Core/CompilerWarnings.cs
@@ -2,6 +2,7 @@
 namespace WixToolset.Core
 {
+    using System;
    using WixToolset.Data;
    internal static class CompilerWarnings
@@ -61,6 +62,191 @@ namespace WixToolset.Core
            return Message(sourceLineNumbers, Ids.Win64Component, "The Provides element should not be authored in the 64-bit component with identifier {0}. The dependency feature may not work if installing this package on 64-bit Windows operating systems prior to Windows 7 and Windows Server 2008 R2. Set the Component/@Bitness attribute to \"always32\" to ensure the dependency feature works correctly on legacy operating systems.", componentId);
        }
+        public static Message AllChangesIncludedInPatch(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.AllChangesIncludedInPatch, "All changes between the baseline and upgraded packages will be included in the patch except for any change to the ProductCode. The 'All' element is supported primarily for testing purposes and negates the benefits of patch families.");
+        }
+        public static Message AmbiguousFileOrDirectoryName(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.AmbiguousFileOrDirectoryName, "The {0}/@{1} attribute's value '{2}' is an ambiguous short name because it ends with a '~' character followed by a number. Under some circumstances, this name could resolve to more than one file or directory name and lead to unpredictable results (for example 'MICROS~1' may correspond to 'Microsoft Shared' or 'Microsoft Foo' or literally 'Micros~1').", elementName, attributeName, value);
+        }
+        public static Message AttributeShouldContain(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue, string expectedContains, string otherAttributeName, string otherAttributeValue)
+        {
+            return Message(sourceLineNumbers, Ids.AttributeShouldContain, "The {0}/@{1} attribute value '{2}' should contain '{3}' when the {0}/@{4} attribute is set to '{5}'.", elementName, attributeName, attributeValue, expectedContains, otherAttributeName, otherAttributeValue);
+        }
+        public static Message CopyFileFileIdUseless(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.CopyFileFileIdUseless, "Since the CopyFile/@FileId attribute was specified but none of the following attributes (DestinationName, DestinationDirectory, DestinationProperty) were specified, this authoring will not do anything.");
+        }
+        public static Message DeprecatedPreProcVariable(SourceLineNumber sourceLineNumbers, string oldName, string newName)
+        {
+            return Message(sourceLineNumbers, Ids.DeprecatedPreProcVariable, "The built-in preprocessor variable '{0}' is deprecated. Please correct your authoring to use the new '{1}' preprocessor variable instead.", oldName, newName);
+        }
+        public static Message DeprecatedUpgradeProperty(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.DeprecatedUpgradeProperty, "Specifying a Property element as a child of an Upgrade element has been deprecated. Please specify this Property element as a child of a different element such as Package or Fragment.");
+        }
+        public static Message DirectoryRedundantNames(SourceLineNumber sourceLineNumbers, string elementName, string shortNameAttributeName, string longNameAttributeName, string attributeValue)
+        {
+            return Message(sourceLineNumbers, Ids.DirectoryRedundantNames, "The {0} element's {1} and {2} values are both '{3}'. This is redundant; the {2} attribute should be removed.", elementName, shortNameAttributeName, longNameAttributeName, attributeValue);
+        }
+        public static Message DirectoryRedundantNames(SourceLineNumber sourceLineNumbers, string elementName, string sourceNameAttributeName, string longSourceAttributeName)
+        {
+            return Message(sourceLineNumbers, Ids.DirectoryRedundantNames, "The {0} element's source and destination names are identical. This is redundant; the {1} and {2} attributes should be removed if present.", elementName, sourceNameAttributeName, longSourceAttributeName);
+        }
+        public static Message DetectConditionRecommended(SourceLineNumber sourceLineNumbers, string elementName)
+        {
+            return Message(sourceLineNumbers, Ids.DetectConditionRecommended, "The {0}/@DetectCondition attribute is recommended so the package is only installed when absent.", elementName);
+        }
+        public static Message ExePackageDetectInformationRecommended(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.ExePackageDetectInformationRecommended, "The ExePackage/@DetectCondition attribute or child element ArpEntry is recommended so the package is only installed when absent.");
+        }
+        public static Message FileSearchFileNameIssue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName1, string attributeName2)
+        {
+            return Message(sourceLineNumbers, Ids.FileSearchFileNameIssue, "The {0} element's {1} and {2} attributes were found. Due to a bug with the Windows Installer, only the Name or LongName attribute should be used. Use the Name attribute for 8.3 compliant file names and the LongName attribute for longer ones. When using only the LongName attribute, ICE03 should be ignored for the Signature table's FileName column.", elementName, attributeName1, attributeName2);
+        }
+        public static Message IdentifierCannotBeModularized(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string identifier, int length, int maximumLength)
+        {
+            return Message(sourceLineNumbers, Ids.IdentifierCannotBeModularized, "The {0}/@{1} attribute's value, '{2}', is {3} characters long. It will be too long if modularized. The identifier shouldn't be longer than {4} characters long to allow for modularization (appending a guid for merge modules).", elementName, attributeName, identifier, length, maximumLength);
+        }
+        public static Message IdentifierTooLong(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.IdentifierTooLong, "The {0}/@{1} attribute's value, '{2}', is too long for an identifier. Standard identifiers are 72 characters long or less.", elementName, attributeName, value);
+        }
+        public static Message MediaExternalCabinetFilenameIllegal(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.MediaExternalCabinetFilenameIllegal, "The {0}/@{1} attribute's value, '{2}', is not a valid external cabinet name. Legal cabinet names should follow 8.3 format: they should contain no more than 8 characters followed by an optional extension of no more than 3 characters. Any character except for the following may be used: \\ ? | > < : / * \" + , ; = [ ] (space). The Windows Installer team has recommended following the 8.3 format for external cabinet files and any other naming scheme is officially unsupported (which means it is not guaranteed to work on all platforms).", elementName, attributeName, value);
+        }
+        public static Message MissingUpgradeCode(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.MissingUpgradeCode, "The Package/@UpgradeCode attribute was not found; it is strongly recommended to ensure that this package can be upgraded.");
+        }
+        public static Message OrphanedProgId(SourceLineNumber sourceLineNumbers, string progId)
+        {
+            return Message(sourceLineNumbers, Ids.OrphanedProgId, "ProgId '{0}' is orphaned. It has no associated component, so it will never install. Every ProgId should have either a parent Class element or child Extension element (at any distance).", progId);
+        }
+        public static Message PathCanonicalized(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string originalValue, string canonicalValue)
+        {
+            return Message(sourceLineNumbers, Ids.PathCanonicalized, "The {0}/@{1} attribute's value, '{2}', has been canonicalized to '{3}'.", elementName, attributeName, originalValue, canonicalValue);
+        }
+        public static Message PlaceholderValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.PlaceholderValue, "The {0}/@{1} attribute's value, '{2}', is a placeholder value used in example files. Please replace this placeholder with the appropriate value.", elementName, attributeName, value);
+        }
+        public static Message PreprocessorUnknownPragma(SourceLineNumber sourceLineNumbers, string pragmaName)
+        {
+            return Message(sourceLineNumbers, Ids.PreprocessorUnknownPragma, "The pragma '{0}' is unknown. Please ensure you have referenced the extension that defines this pragma.", pragmaName);
+        }
+        public static Message PreprocessorWarning(SourceLineNumber sourceLineNumbers, string message)
+        {
+            return Message(sourceLineNumbers, Ids.PreprocessorWarning, "{0}", message);
+        }
+        public static Message ProductIdAuthored(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.ProductIdAuthored, "The 'ProductID' property should not be directly authored because it will prevent the ValidateProductID standard action from performing any validation during the installation. This property will be set by the ValidateProductID standard action or control event.");
+        }
+        public static Message PropertyModularizationSuppressed(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.PropertyModularizationSuppressed, "The Property/@SuppressModularization attribute has been set to 'yes'. Using this functionality is strongly discouraged; it should only be necessary as a workaround of last resort in rare scenarios.");
+        }
+        public static Message PropertyUseless(SourceLineNumber sourceLineNumbers, string id)
+        {
+            return Message(sourceLineNumbers, Ids.PropertyUseless, "Property '{0}' does not contain a Value attribute and is not marked as Admin, Secure, or Hidden. The Property element is being ignored.", id);
+        }
+        public static Message PropertyValueContainsPropertyReference(SourceLineNumber sourceLineNumbers, string propertyId, string otherProperty)
+        {
+            return Message(sourceLineNumbers, Ids.PropertyValueContainsPropertyReference, "The '{0}' Property contains '[{1}]' in its value which is an illegal reference to another property. If this value is a string literal, not a property reference, please ignore this warning. To set a property with the value of another property, use a CustomAction with Property and Value attributes.", propertyId, otherProperty);
+        }
+        public static Message RemotePayloadsMustNotAlsoBeCompressed(SourceLineNumber sourceLineNumbers, string elementName)
+        {
+            return Message(sourceLineNumbers, Ids.RemotePayloadsMustNotAlsoBeCompressed, "The {0}/@Compressed attribute must have value 'no' when a RemotePayload child element is present. RemotePayload indicates that a package will always be downloaded and cannot be compressed into a bundle. To eliminate this warning, explicitly set the {0}/@Compressed attribute to 'no'.", elementName);
+        }
+        public static Message RequiresMsi200for64bitPackage(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.RequiresMsi200for64bitPackage, "Package/@InstallerVersion must be 200 or greater for a 64-bit package. The value will be changed to 200. Please specify a value of 200 or greater in order to eliminate this warning.");
+        }
+        public static Message RequiresMsi500forArmPackage(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.RequiresMsi500forArmPackage, "Package/@InstallerVersion must be 500 or greater for an ARM64 package. The value will be changed to 500. Please specify a value of 500 or greater in order to eliminate this warning.");
+        }
+        public static Message ReservedAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
+        {
+            return Message(sourceLineNumbers, Ids.ReservedAttribute, "The {0}/@{1} attribute is reserved for future use and has no effect in this version of the WiX toolset.", elementName, attributeName);
+        }
+        public static Message ServiceConfigFamilyNotSupported(SourceLineNumber sourceLineNumbers, string elementName)
+        {
+            return Message(sourceLineNumbers, Ids.ServiceConfigFamilyNotSupported, "{0} functionality is documented in the Windows Installer SDK to \"not [work] as expected.\" Consider replacing {0} with the WixToolset.Util.wixext ServiceConfig element.", elementName);
+        }
+        public static Message UnableToResetAcls(string error)
+        {
+            return Message(null, Ids.UnableToResetAcls, "Unable to reset acls on destination files. Exception detail: {0}", error);
+        }
+        public static Message UnavailableBundleConditionVariable(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string variable, string illegalValueList)
+        {
+            return Message(sourceLineNumbers, Ids.UnavailableBundleConditionVariable, "{0}/@{1} contains the built-in Variable '{2}', which is not available when it is evaluated. (Unavailable Variables are: {3}.). Rewrite the condition to avoid Variables that are never valid during its evaluation.", elementName, attributeName, variable, illegalValueList);
+        }
+        public static Message UnclearShortcut(SourceLineNumber sourceLineNumbers, string shortcutId, string fileId, string componentId)
+        {
+            return Message(sourceLineNumbers, Ids.UnclearShortcut, "Because it is an advertised shortcut, the target of shortcut '{0}' will be the keypath of component '{2}' rather than parent file '{1}'. To eliminate this warning, you can (1) make the Shortcut element a child of the File element that is the keypath of component '{2}', (2) make file '{1}' the keypath of component '{2}', or (3) remove the @Advertise attribute so the shortcut is a non-advertised shortcut.", shortcutId, fileId, componentId);
+        }
+        public static Message UnsupportedCommandLineArgumentValue(string arg, string value, string fallback)
+        {
+            return Message(null, Ids.UnsupportedCommandLineArgument, "The value '{0}' is not a valid value for command line argument '{1}'. Using the value '{2}' instead.", value, arg, fallback);
+        }
+        public static Message UxPayloadsOnlySupportEmbedding(SourceLineNumber sourceLineNumbers, string sourceFile)
+        {
+            return Message(sourceLineNumbers, Ids.UxPayloadsOnlySupportEmbedding, "A bootstrapper application or bundle extension payload ('{0}') was marked for something other than embedded packaging, possibly because it included a @DownloadUrl attribute. Bootstrapper application and bundle extension payloads must be embedded in the bundle, so the requested packaging is being ignored and the file is being embedded anyway.", sourceFile);
+        }
+        public static Message VariableDeclarationCollision(SourceLineNumber sourceLineNumbers, string variableName, string variableValue, string variableCollidingValue)
+        {
+            return Message(sourceLineNumbers, Ids.VariableDeclarationCollision, "The variable '{0}' with value '{1}' was previously declared with value '{2}'.", variableName, variableValue, variableCollidingValue);
+        }
+        public static Message VBScriptIsDeprecated(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.VBScriptIsDeprecated, "VBScript is a deprecated Windows component: https://learn.microsoft.com/en-us/windows/whats-new/deprecated-features. VBScript custom actions might fail on some Windows systems. Rewrite or eliminate VBScript custom actions for best compatibility.");
+        }
        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
        {
            return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args);
@@ -68,6 +254,41 @@ namespace WixToolset.Core
        public enum Ids
        {
+            IdentifierCannotBeModularized = 1000,
+            CopyFileFileIdUseless = 1003,
+            OrphanedProgId = 1005,
+            PropertyUseless = 1006,
+            IdentifierTooLong = 1026,
+            DirectoryRedundantNames = 1031,
+            UnableToResetAcls = 1032,
+            MediaExternalCabinetFilenameIllegal = 1033,
+            DeprecatedPreProcVariable = 1034,
+            FileSearchFileNameIssue = 1043,
+            AmbiguousFileOrDirectoryName = 1044,
+            PlaceholderValue = 1074,
+            MissingUpgradeCode = 1075,
+            PropertyValueContainsPropertyReference = 1077,
+            DeprecatedUpgradeProperty = 1078,
+            ProductIdAuthored = 1083,
+            PropertyModularizationSuppressed = 1086,
+            PreprocessorWarning = 1096,
+            UnsupportedCommandLineArgument = 1098,
+            UnclearShortcut = 1113,
+            VariableDeclarationCollision = 1118,
+            RequiresMsi200for64bitPackage = 1121,
+            PreprocessorUnknownPragma = 1125,
+            UxPayloadsOnlySupportEmbedding = 1127,
+            AttributeShouldContain = 1136,
+            ReservedAttribute = 1142,
+            RequiresMsi500forArmPackage = 1143,
+            RemotePayloadsMustNotAlsoBeCompressed = 1144,
+            AllChangesIncludedInPatch = 1145,
+            ServiceConfigFamilyNotSupported = 1149,
+            PathCanonicalized = 1152,
+            DetectConditionRecommended = 1153,
+            UnavailableBundleConditionVariable = 1159,
+            ExePackageDetectInformationRecommended = 1161,
+            VBScriptIsDeprecated = 1163,
            ProvidesKeyNotFound = 5431,
            RequiresKeyNotFound = 5432,
            PropertyRemoved = 5433,
@@ -76,7 +297,6 @@ namespace WixToolset.Core
            DirectoryRefStandardDirectoryDeprecated = 5436,
            DefiningStandardDirectoryDeprecated = 5437,
            ReadonlyLogVariableTarget = 5438,
-            // DO_NOT_REUSE ReservedBurnNamespaceWarning = 5439,
            PatchCreationDeprecated = 5440,
        } // 5400-5499 and 6600-6699 were the ranges for Dependency and Tag which are now in Core between CompilerWarnings and CompilerErrors.
    }
diff --git a/src/wix/WixToolset.Core/Compiler_Bundle.cs b/src/wix/WixToolset.Core/Compiler_Bundle.cs
index 81f759a1..2a36581c 100644
--- a/src/wix/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/wix/WixToolset.Core/Compiler_Bundle.cs
@@ -2518,7 +2518,7 @@ namespace WixToolset.Core
                    }
                    else
                    {
-                        this.Core.Write(WarningMessages.ExePackageDetectInformationRecommended(sourceLineNumbers));
+                        this.Core.Write(CompilerWarnings.ExePackageDetectInformationRecommended(sourceLineNumbers));
                    }
                }
@@ -2536,17 +2536,17 @@ namespace WixToolset.Core
                        {
                            if (null == installArguments || -1 == installArguments.IndexOf(expectedArgument, StringComparison.OrdinalIgnoreCase))
                            {
-                                this.Core.Write(WarningMessages.AttributeShouldContain(sourceLineNumbers, node.Name.LocalName, "InstallArguments", installArguments, expectedArgument, "Protocol", "netfx4"));
+                                this.Core.Write(CompilerWarnings.AttributeShouldContain(sourceLineNumbers, node.Name.LocalName, "InstallArguments", installArguments, expectedArgument, "Protocol", "netfx4"));
                            }
                            if (!String.IsNullOrEmpty(repairArguments) && -1 == repairArguments.IndexOf(expectedArgument, StringComparison.OrdinalIgnoreCase))
                            {
-                                this.Core.Write(WarningMessages.AttributeShouldContain(sourceLineNumbers, node.Name.LocalName, "RepairArguments", repairArguments, expectedArgument, "Protocol", "netfx4"));
+                                this.Core.Write(CompilerWarnings.AttributeShouldContain(sourceLineNumbers, node.Name.LocalName, "RepairArguments", repairArguments, expectedArgument, "Protocol", "netfx4"));
                            }
                            if (!String.IsNullOrEmpty(uninstallArguments) && -1 == uninstallArguments.IndexOf(expectedArgument, StringComparison.OrdinalIgnoreCase))
                            {
-                                this.Core.Write(WarningMessages.AttributeShouldContain(sourceLineNumbers, node.Name.LocalName, "UninstallArguments", uninstallArguments, expectedArgument, "Protocol", "netfx4"));
+                                this.Core.Write(CompilerWarnings.AttributeShouldContain(sourceLineNumbers, node.Name.LocalName, "UninstallArguments", uninstallArguments, expectedArgument, "Protocol", "netfx4"));
                            }
                        }
@@ -2578,7 +2578,7 @@ namespace WixToolset.Core
                // Detect condition is recommended for Msu packages.
                if (String.IsNullOrEmpty(detectCondition))
                {
-                    this.Core.Write(WarningMessages.DetectConditionRecommended(sourceLineNumbers, node.Name.LocalName));
+                    this.Core.Write(CompilerWarnings.DetectConditionRecommended(sourceLineNumbers, node.Name.LocalName));
                }
            }
diff --git a/src/wix/WixToolset.Core/Compiler_Module.cs b/src/wix/WixToolset.Core/Compiler_Module.cs
index 41a75165..788b0f0c 100644
--- a/src/wix/WixToolset.Core/Compiler_Module.cs
+++ b/src/wix/WixToolset.Core/Compiler_Module.cs
@@ -45,7 +45,7 @@ namespace WixToolset.Core
                        this.activeName = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                        if ("PUT-MODULE-NAME-HERE" == this.activeName)
                        {
-                            this.Core.Write(WarningMessages.PlaceholderValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, this.activeName));
+                            this.Core.Write(CompilerWarnings.PlaceholderValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, this.activeName));
                        }
                        else
                        {
diff --git a/src/wix/WixToolset.Core/Compiler_Package.cs b/src/wix/WixToolset.Core/Compiler_Package.cs
index 004c8c1d..00e2d6dc 100644
--- a/src/wix/WixToolset.Core/Compiler_Package.cs
+++ b/src/wix/WixToolset.Core/Compiler_Package.cs
@@ -73,14 +73,14 @@ namespace WixToolset.Core
                        manufacturer = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.MustHaveNonWhitespaceCharacters);
                        if ("PUT-COMPANY-NAME-HERE" == manufacturer)
                        {
-                            this.Core.Write(WarningMessages.PlaceholderValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, manufacturer));
+                            this.Core.Write(CompilerWarnings.PlaceholderValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, manufacturer));
                        }
                        break;
                    case "Name":
                        this.activeName = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.MustHaveNonWhitespaceCharacters);
                        if ("PUT-PRODUCT-NAME-HERE" == this.activeName)
                        {
-                            this.Core.Write(WarningMessages.PlaceholderValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, this.activeName));
+                            this.Core.Write(CompilerWarnings.PlaceholderValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, this.activeName));
                        }
                        break;
                    case "ProductCode":
@@ -165,7 +165,7 @@ namespace WixToolset.Core
            {
                if (id is null)
                {
-                    this.Core.Write(WarningMessages.MissingUpgradeCode(sourceLineNumbers));
+                    this.Core.Write(CompilerWarnings.MissingUpgradeCode(sourceLineNumbers));
                }
                else
                {
@@ -510,13 +510,13 @@ namespace WixToolset.Core
            if (String.Equals(platform, "X64", StringComparison.OrdinalIgnoreCase) && 200 > msiVersion)
            {
                msiVersion = 200;
-                this.Core.Write(WarningMessages.RequiresMsi200for64bitPackage(sourceLineNumbers));
+                this.Core.Write(CompilerWarnings.RequiresMsi200for64bitPackage(sourceLineNumbers));
            }
            if (String.Equals(platform, "Arm64", StringComparison.OrdinalIgnoreCase) && 500 > msiVersion)
            {
                msiVersion = 500;
-                this.Core.Write(WarningMessages.RequiresMsi500forArmPackage(sourceLineNumbers));
+                this.Core.Write(CompilerWarnings.RequiresMsi500forArmPackage(sourceLineNumbers));
            }
            this.Core.AddSymbol(new SummaryInformationSymbol(sourceLineNumbers)
@@ -871,7 +871,7 @@ namespace WixToolset.Core
                        packageAuthor = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                        if ("PUT-COMPANY-NAME-HERE" == packageAuthor)
                        {
-                            this.Core.Write(WarningMessages.PlaceholderValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, packageAuthor));
+                            this.Core.Write(CompilerWarnings.PlaceholderValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, packageAuthor));
                        }
                        break;
                    default:
@@ -1443,7 +1443,7 @@ namespace WixToolset.Core
            // raise an error for an orphaned ProgId
            if (YesNoType.Yes == advertise && !foundExtension && null == parent && null == classId)
            {
-                this.Core.Write(WarningMessages.OrphanedProgId(sourceLineNumbers, progId));
+                this.Core.Write(CompilerWarnings.OrphanedProgId(sourceLineNumbers, progId));
            }
            return progId;
@@ -1509,7 +1509,7 @@ namespace WixToolset.Core
            }
            else if ("ProductID" == id.Id)
            {
-                this.Core.Write(WarningMessages.ProductIdAuthored(sourceLineNumbers));
+                this.Core.Write(CompilerWarnings.ProductIdAuthored(sourceLineNumbers));
            }
            else if ("SecureCustomProperties" == id.Id || "AdminProperties" == id.Id || "MsiHiddenProperties" == id.Id)
            {
@@ -1572,7 +1572,7 @@ namespace WixToolset.Core
                // the element.
                if (String.IsNullOrEmpty(value) && !admin && !secure && !hidden)
                {
-                    this.Core.Write(WarningMessages.PropertyUseless(sourceLineNumbers, id.Id));
+                    this.Core.Write(CompilerWarnings.PropertyUseless(sourceLineNumbers, id.Id));
                }
                else // there is a value and/or a flag set, do that.
                {
@@ -1582,7 +1582,7 @@ namespace WixToolset.Core
            if (!this.Core.EncounteredError && YesNoType.Yes == suppressModularization)
            {
-                this.Core.Write(WarningMessages.PropertyModularizationSuppressed(sourceLineNumbers));
+                this.Core.Write(CompilerWarnings.PropertyModularizationSuppressed(sourceLineNumbers));
                this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers)
                {
@@ -2758,7 +2758,7 @@ namespace WixToolset.Core
            string requiredPrivileges = null;
            string sid = null;
-            this.Core.Write(WarningMessages.ServiceConfigFamilyNotSupported(sourceLineNumbers, node.Name.LocalName));
+            this.Core.Write(CompilerWarnings.ServiceConfigFamilyNotSupported(sourceLineNumbers, node.Name.LocalName));
            foreach (var attrib in node.Attributes())
            {
@@ -3140,7 +3140,7 @@ namespace WixToolset.Core
            string actions = null;
            string actionsDelays = null;
-            this.Core.Write(WarningMessages.ServiceConfigFamilyNotSupported(sourceLineNumbers, node.Name.LocalName));
+            this.Core.Write(CompilerWarnings.ServiceConfigFamilyNotSupported(sourceLineNumbers, node.Name.LocalName));
            foreach (var attrib in node.Attributes())
            {
@@ -4331,7 +4331,7 @@ namespace WixToolset.Core
                {
                    if (YesNoType.Yes != parentKeyPath && "Component" != parentElementLocalName)
                    {
-                        this.Core.Write(WarningMessages.UnclearShortcut(sourceLineNumbers, id.Id, componentId, defaultTarget));
+                        this.Core.Write(CompilerWarnings.UnclearShortcut(sourceLineNumbers, id.Id, componentId, defaultTarget));
                    }
                    target = Guid.Empty.ToString("B");
@@ -4738,7 +4738,7 @@ namespace WixToolset.Core
                    {
                    case "Property":
                        this.ParsePropertyElement(child);
-                        this.Core.Write(WarningMessages.DeprecatedUpgradeProperty(childSourceLineNumbers));
+                        this.Core.Write(CompilerWarnings.DeprecatedUpgradeProperty(childSourceLineNumbers));
                        break;
                    case "UpgradeVersion":
                        this.ParseUpgradeVersionElement(child, id);
diff --git a/src/wix/WixToolset.Core/Compiler_Patch.cs b/src/wix/WixToolset.Core/Compiler_Patch.cs
index e20737dd..98bbf6a6 100644
--- a/src/wix/WixToolset.Core/Compiler_Patch.cs
+++ b/src/wix/WixToolset.Core/Compiler_Patch.cs
@@ -715,7 +715,7 @@ namespace WixToolset.Core
            this.Core.ParseForExtensionElements(node);
            // Always warn when using the All element.
-            this.Core.Write(WarningMessages.AllChangesIncludedInPatch(sourceLineNumbers));
+            this.Core.Write(CompilerWarnings.AllChangesIncludedInPatch(sourceLineNumbers));
            if (!this.Core.EncounteredError)
            {
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/BundleValidator.cs b/src/wix/WixToolset.Core/ExtensibilityServices/BundleValidator.cs
index 77ab4ed7..f55a9823 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/BundleValidator.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/BundleValidator.cs
@@ -162,7 +162,7 @@ namespace WixToolset.Core.ExtensibilityServices
                    var canonicalizedPath = normalizedPath.Substring(root.Length);
                    if (canonicalizedPath != relativePath)
                    {
-                        this.Messaging.Write(WarningMessages.PathCanonicalized(sourceLineNumbers, elementName, attributeName, relativePath, canonicalizedPath));
+                        this.Messaging.Write(CompilerWarnings.PathCanonicalized(sourceLineNumbers, elementName, attributeName, relativePath, canonicalizedPath));
                    }
                    return canonicalizedPath;
                }
@@ -341,7 +341,7 @@ namespace WixToolset.Core.ExtensibilityServices
                if (condition.Contains(variableName))
                {
                    var illegalValues = CreateValueList(ValueListKind.Or, unavailableVariables);
-                    this.Messaging.Write(WarningMessages.UnavailableBundleConditionVariable(sourceLineNumbers, elementName, attributeName, variableName, illegalValues));
+                    this.Messaging.Write(CompilerWarnings.UnavailableBundleConditionVariable(sourceLineNumbers, elementName, attributeName, variableName, illegalValues));
                    return false;
                }
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
index 57d19450..41bfd382 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
@@ -444,7 +444,7 @@ namespace WixToolset.Core.ExtensibilityServices
            }
            else if (72 < value.Length)
            {
-                this.Messaging.Write(WarningMessages.IdentifierTooLong(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                this.Messaging.Write(CompilerWarnings.IdentifierTooLong(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
            }
            return new Identifier(access, value);
@@ -488,7 +488,7 @@ namespace WixToolset.Core.ExtensibilityServices
                }
                else if (CompilerCore.IsAmbiguousFilename(value))
                {
-                    this.Messaging.Write(WarningMessages.AmbiguousFileOrDirectoryName(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                    this.Messaging.Write(CompilerWarnings.AmbiguousFileOrDirectoryName(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
                }
            }
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
index 3cdd0f43..d8951c67 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
@@ -48,7 +48,7 @@ namespace WixToolset.Core.ExtensibilityServices
            {
                if (showWarning && value != currentValue)
                {
-                    this.Messaging.Write(WarningMessages.VariableDeclarationCollision(context.CurrentSourceLineNumber, name, value, currentValue));
+                    this.Messaging.Write(CompilerWarnings.VariableDeclarationCollision(context.CurrentSourceLineNumber, name, value, currentValue));
                }
                context.Variables[name] = value;
@@ -226,7 +226,7 @@ namespace WixToolset.Core.ExtensibilityServices
                            return context.CurrentSourceLineNumber.FileName;
                        case "PLATFORM":
-                            this.Messaging.Write(WarningMessages.DeprecatedPreProcVariable(context.CurrentSourceLineNumber, "$(sys.PLATFORM)", "$(sys.BUILDARCH)"));
+                            this.Messaging.Write(CompilerWarnings.DeprecatedPreProcVariable(context.CurrentSourceLineNumber, "$(sys.PLATFORM)", "$(sys.BUILDARCH)"));
                            goto case "BUILDARCH";
@@ -320,7 +320,7 @@ namespace WixToolset.Core.ExtensibilityServices
                    {
                        // Add any core defined pragmas here
                        default:
-                            this.Messaging.Write(WarningMessages.PreprocessorUnknownPragma(context.CurrentSourceLineNumber, pragmaName));
+                            this.Messaging.Write(CompilerWarnings.PreprocessorUnknownPragma(context.CurrentSourceLineNumber, pragmaName));
                            break;
                    }
                    break;
@@ -331,7 +331,7 @@ namespace WixToolset.Core.ExtensibilityServices
                    {
                        if (!extension.ProcessPragma(prefix, pragma, args, parent))
                        {
-                            this.Messaging.Write(WarningMessages.PreprocessorUnknownPragma(context.CurrentSourceLineNumber, pragmaName));
+                            this.Messaging.Write(CompilerWarnings.PreprocessorUnknownPragma(context.CurrentSourceLineNumber, pragmaName));
                        }
                    }
                    break;
diff --git a/src/wix/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs b/src/wix/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
index a9f4e027..092a1737 100644
--- a/src/wix/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
+++ b/src/wix/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
@@ -69,7 +69,7 @@ namespace WixToolset.Core.Link
                {
                    if (SectionType.Unknown != expectedEntrySectionType && section.Type != expectedEntrySectionType)
                    {
-                        this.Messaging.Write(WarningMessages.UnexpectedEntrySection(section.Symbols.FirstOrDefault()?.SourceLineNumbers, section.Type.ToString(), expectedEntrySectionType.ToString()));
+                        this.Messaging.Write(LinkerWarnings.UnexpectedEntrySection(section.Symbols.FirstOrDefault()?.SourceLineNumbers, section.Type.ToString(), expectedEntrySectionType.ToString()));
                    }
                    if (null == this.EntrySection)
diff --git a/src/wix/WixToolset.Core/Link/FlattenAndProcessBundleTablesCommand.cs b/src/wix/WixToolset.Core/Link/FlattenAndProcessBundleTablesCommand.cs
index 48b2286d..f69c8685 100644
--- a/src/wix/WixToolset.Core/Link/FlattenAndProcessBundleTablesCommand.cs
+++ b/src/wix/WixToolset.Core/Link/FlattenAndProcessBundleTablesCommand.cs
@@ -183,7 +183,7 @@ namespace WixToolset.Core.Link
                                }
                                else if (PackagingType.Embedded != payloadSymbol.Packaging)
                                {
-                                    this.Messaging.Write(WarningMessages.UxPayloadsOnlySupportEmbedding(payloadSymbol.SourceLineNumbers, payloadSymbol.SourceFile.Path));
+                                    this.Messaging.Write(CompilerWarnings.UxPayloadsOnlySupportEmbedding(payloadSymbol.SourceLineNumbers, payloadSymbol.SourceFile.Path));
                                    payloadSymbol.Packaging = PackagingType.Embedded;
                                }
                            }
diff --git a/src/wix/WixToolset.Core/Linker.cs b/src/wix/WixToolset.Core/Linker.cs
index b119e4be..d2dc1887 100644
--- a/src/wix/WixToolset.Core/Linker.cs
+++ b/src/wix/WixToolset.Core/Linker.cs
@@ -906,7 +906,7 @@ namespace WixToolset.Core
                        {
                            if (!multipleFeatureComponents.Contains(connectionId))
                            {
-                                this.Messaging.Write(WarningMessages.ImplicitComponentPrimaryFeature(connectionId));
+                                this.Messaging.Write(LinkerWarnings.ImplicitComponentPrimaryFeature(connectionId));
                                // remember this component so only one warning is generated for it
                                multipleFeatureComponents[connectionId] = null;
@@ -914,7 +914,7 @@ namespace WixToolset.Core
                        }
                        else
                        {
-                            this.Messaging.Write(WarningMessages.ImplicitMergeModulePrimaryFeature(connectionId));
+                            this.Messaging.Write(LinkerWarnings.ImplicitMergeModulePrimaryFeature(connectionId));
                        }
                    }
diff --git a/src/wix/WixToolset.Core/LinkerWarnings.cs b/src/wix/WixToolset.Core/LinkerWarnings.cs
index 0eca090e..554e2d0f 100644
--- a/src/wix/WixToolset.Core/LinkerWarnings.cs
+++ b/src/wix/WixToolset.Core/LinkerWarnings.cs
@@ -16,6 +16,21 @@ namespace WixToolset.Core
            return Message(sourceLineNumbers, Ids.PayloadInMultipleContainers, "The Payload '{0}' can't be added to Container '{1}' because it was already added to Container '{2}'.", payloadId, containerId1, containerId2);
        }
+        public static Message ImplicitComponentPrimaryFeature(string componentId)
+        {
+            return Message(null, Ids.ImplicitComponentPrimaryFeature, "The component '{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 ComponentRef/@Primary, ComponentGroupRef/@Primary, or FeatureGroupRef/@Primary locations for this component.", componentId);
+        }
+        public static Message ImplicitMergeModulePrimaryFeature(string componentId)
+        {
+            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 UnexpectedEntrySection(SourceLineNumber sourceLineNumbers, string sectionType, string expectedType)
+        {
+            return Message(sourceLineNumbers, Ids.UnexpectedEntrySection, "Found entry point <{0}> that does not match expected <{1}> output type. Verify that your source code is correct and matches the expected output type.", sectionType, expectedType);
+        }
        private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
        {
            return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args);
@@ -23,6 +38,9 @@ namespace WixToolset.Core
        public enum Ids
        {
+            ImplicitComponentPrimaryFeature = 1049,
+            ImplicitMergeModulePrimaryFeature = 1084,
+            UnexpectedEntrySection = 1109,
            LayoutPayloadInContainer = 6900,
            PayloadInMultipleContainers = 6901,
        } // last available is 6999. 7000 is LinkerErrors.
diff --git a/src/wix/WixToolset.Core/Preprocessor.cs b/src/wix/WixToolset.Core/Preprocessor.cs
index c403d73b..e6e718c6 100644
--- a/src/wix/WixToolset.Core/Preprocessor.cs
+++ b/src/wix/WixToolset.Core/Preprocessor.cs
@@ -568,7 +568,7 @@ namespace WixToolset.Core
            // Resolve other variables in the warning message.
            warningMessage = state.Helper.PreprocessString(state.Context, warningMessage);
-            this.Messaging.Write(WarningMessages.PreprocessorWarning(state.Context.CurrentSourceLineNumber, warningMessage));
+            this.Messaging.Write(CompilerWarnings.PreprocessorWarning(state.Context.CurrentSourceLineNumber, warningMessage));
        }
        /// <summary>
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs
index eeee46b1..95682989 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/PayloadFixture.cs
@@ -73,7 +73,7 @@ namespace WixToolsetTest.CoreIntegration
                result.AssertSuccess();
-                Assert.Single(result.Messages, m => m.Id == (int)WarningMessages.Ids.PathCanonicalized);
+                Assert.Single(result.Messages, m => m.Id == 1152); // CompilerWarnings.PathCanonicalized
                var intermediate = Intermediate.Load(wixlibPath);
                var allSymbols = intermediate.Sections.SelectMany(s => s.Symbols);
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WarningFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/WarningFixture.cs
index 32785bde..88855133 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/WarningFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/WarningFixture.cs
@@ -53,7 +53,7 @@ namespace WixToolsetTest.CoreIntegration
                    "-o", wixlibPath,
                });
-                Assert.Equal((int)WarningMessages.Ids.PathCanonicalized, result.ExitCode);
+                Assert.Equal(1152, result.ExitCode);  // CompilerWarnings.PathCanonicalized
                var message = Assert.Single(result.Messages);
                Assert.Equal(MessageLevel.Error, message.Level);