Privatize error messages to their components

Fixes 6423

86 files changed, 2042 insertions, 2414 deletions

diff --git a/src/api/wix/WixToolset.Data/ErrorMessages.cs b/src/api/wix/WixToolset.Data/ErrorMessages.cs
index f3add0a1..21bdaada 100644
--- a/src/api/wix/WixToolset.Data/ErrorMessages.cs
+++ b/src/api/wix/WixToolset.Data/ErrorMessages.cs
@@ -8,336 +8,19 @@ namespace WixToolset.Data
 
     public static class ErrorMessages
     {
-        public static Message ActionCircularDependency(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName1, string actionName2)
-        {
-            return Message(sourceLineNumbers, Ids.ActionCircularDependency, "The {0} table contains an action '{1}' that is scheduled to come before or after action '{2}', which is also scheduled to come before or after action '{1}'. Please remove this circular dependency by changing the Before or After attribute for one of the actions.", sequenceTableName, actionName1, actionName2);
-        }
-
-        public static Message ActionCollision(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
-        {
-            return Message(sourceLineNumbers, Ids.ActionCollision, "The {0} table contains an action '{1}' that is declared in two different locations. Please remove one of the actions or set the Overridable='yes' attribute on one of their elements.", sequenceTableName, actionName);
-        }
-
-        public static Message ActionCollision2(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.ActionCollision2, "The location of the action related to previous error.");
-        }
-
-        public static Message ActionScheduledRelativeToItself(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue)
-        {
-            return Message(sourceLineNumbers, Ids.ActionScheduledRelativeToItself, "The {0}/@{1} attribute's value '{2}' is invalid because it would make this action dependent upon itself. Please change the value to the name of a different action.", elementName, attributeName, attributeValue);
-        }
-
-        public static Message ActionScheduledRelativeToTerminationAction(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName1, string actionName2)
-        {
-            return Message(sourceLineNumbers, Ids.ActionScheduledRelativeToTerminationAction, "The {0} table contains an action '{1}' that is scheduled to come before or after action '{2}', which is a special action which only occurs when the installer terminates. These special actions can be identified by their negative sequence numbers. Please schedule the action '{1}' to come before or after a different action.", sequenceTableName, actionName1, actionName2);
-        }
-
-        public static Message ActionScheduledRelativeToTerminationAction2(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.ActionScheduledRelativeToTerminationAction2, "The location of the special termination action related to previous error(s).");
-        }
-
-        public static Message AdditionalArgumentUnexpected(string argument)
-        {
-            return Message(null, Ids.AdditionalArgumentUnexpected, "Additional argument '{0}' was unexpected. Remove the argument and add the '-?' switch for more information.", argument);
-        }
-
-        public static Message AdminImageRequired(string productCode)
-        {
-            return Message(null, Ids.AdminImageRequired, "Source information is required for the product '{0}'. If you ran torch.exe with both target and updated .msi files, you must first perform an administrative installation of both .msi files then pass -a when running torch.exe.", productCode);
-        }
-
-        public static Message AdvertiseStateMustMatch(SourceLineNumber sourceLineNumbers, string advertiseState, string parentAdvertiseState)
-        {
-            return Message(sourceLineNumbers, Ids.AdvertiseStateMustMatch, "The advertise state of this element: '{0}', does not match the advertise state set on the parent element: '{1}'.", advertiseState, parentAdvertiseState);
-        }
-
-        public static Message AppIdIncompatibleAdvertiseState(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, string parentValue)
-        {
-            return Message(sourceLineNumbers, Ids.AppIdIncompatibleAdvertiseState, "The {0}/@(1) attribute's value, '{2}' does not match the advertise state on its parent element: '{3}'. (Note: AppIds nested under Fragment, Module, or Package elements must be advertised.)", elementName, attributeName, value, parentValue);
-        }
-
-        public static Message BaselineRequired()
-        {
-            return Message(null, Ids.BaselineRequired, "No baseline was specified for one of the transforms specified. A baseline is required for all transforms in a patch.");
-        }
-
-        public static Message BinderFileManagerMissingFile(SourceLineNumber sourceLineNumbers, string exceptionMessage)
-        {
-            return Message(sourceLineNumbers, Ids.BinderFileManagerMissingFile, "{0}", exceptionMessage);
-        }
-
-        public static Message BothUpgradeCodesRequired()
-        {
-            return Message(null, Ids.BothUpgradeCodesRequired, "Both the target and updated package authoring must define the Package/@UpgradeCode attribute if the transform validates the UpgradeCode (default). Either define the Package/@UpgradeCode attribute in both the target and updated authoring, or set the Validate/@UpgradeCode attribute to 'no' in the patch authoring.");
-        }
-
-        public static Message BundleTooNew(string bundleExecutable, long bundleVersion)
-        {
-            return Message(null, Ids.BundleTooNew, "Unable to read bundle executable '{0}', because this bundle was created with a newer version of WiX (bundle version '{1}'). You must use a newer version of WiX in order to read this bundle.", bundleExecutable, bundleVersion);
-        }
-
-        public static Message CabExtractionFailed(string cabName, string directoryName)
-        {
-            return Message(null, Ids.CabExtractionFailed, "Failed to extract cab '{0}' to directory '{1}'. This is most likely due to a lack of available disk space on the destination drive.", cabName, directoryName);
-        }
-
-        public static Message CabExtractionFailed(string cabName, string mergeModulePath, string directoryName)
-        {
-            return Message(null, Ids.CabExtractionFailed, "Failed to extract cab '{0}' from merge module '{1}' to directory '{2}'. This is most likely due to a lack of available disk space on the destination drive.", cabName, mergeModulePath, directoryName);
-        }
-
-        public static Message CabFileDoesNotExist(string cabName, string mergeModulePath, string directoryName)
-        {
-            return Message(null, Ids.CabFileDoesNotExist, "Attempted to extract cab '{0}' from merge module '{1}' to directory '{2}'. The cab file was not found. This usually means that you have a merge module without a cabinet inside it.", cabName, mergeModulePath, directoryName);
-        }
-
-        public static Message CannotAuthorSpecialProperties(SourceLineNumber sourceLineNumbers, string propertyName)
-        {
-            return Message(sourceLineNumbers, Ids.CannotAuthorSpecialProperties, "The {0} property was specified. Special MSI properties cannot be authored. Use the attributes on the Property element instead.", propertyName);
-        }
-
-        public static Message CannotDefaultComponentId(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.CannotDefaultComponentId, "The Component/@Id attribute was not found; it is required when there is no valid keypath to use as the default id value.");
-        }
-
-        public static Message CannotDefaultMismatchedAdvertiseStates(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.CannotDefaultMismatchedAdvertiseStates, "MIME element cannot be marked as the default when its advertise state differs from its parent element. Ensure that the advertise state of the MIME element matches its parents element or remove the Mime/@Advertise attribute completely.");
-        }
-
-        public static Message CannotFindFile(SourceLineNumber sourceLineNumbers, string fileId, string fileName, string filePath)
-        {
-            return Message(sourceLineNumbers, Ids.CannotFindFile, "The file with id '{0}' and name '{1}' could not be found with source path: '{2}'.", fileId, fileName, filePath);
-        }
-
-        public static Message CanNotHaveTwoParents(SourceLineNumber sourceLineNumbers, string directorySearch, string parentAttribute, string parentElement)
-        {
-            return Message(sourceLineNumbers, Ids.CanNotHaveTwoParents, "The DirectorySearchRef {0} can not have a Parent attribute {1} and also be nested under parent element {2}", directorySearch, parentAttribute, parentElement);
-        }
-
-        public static Message CannotOpenMergeModule(SourceLineNumber sourceLineNumbers, string mergeModuleIdentifier, string mergeModuleFile)
-        {
-            return Message(sourceLineNumbers, Ids.CannotOpenMergeModule, "Cannot open the merge module '{0}' from file '{1}'.", mergeModuleIdentifier, mergeModuleFile);
-        }
-
-        public static Message CannotReundefineVariable(SourceLineNumber sourceLineNumbers, string variableName)
-        {
-            return Message(sourceLineNumbers, Ids.CannotReundefineVariable, "The variable '{0}' cannot be undefined because its already undefined.", variableName);
-        }
 
-        public static Message CheckBoxValueOnlyValidWithCheckBox(SourceLineNumber sourceLineNumbers, string elementName, string controlType)
-        {
-            return Message(sourceLineNumbers, Ids.CheckBoxValueOnlyValidWithCheckBox, "A {0} element was specified with Type='{1}' and a CheckBoxValue. Check box values can only be specified with Type='CheckBox'.", elementName, controlType);
-        }
-
-        public static Message CircularSearchReference(string chain)
-        {
-            return Message(null, Ids.CircularSearchReference, "A circular reference of search ordering constraints was detected: {0}. Search ordering references must form a directed acyclic graph.", chain);
-        }
 
-        public static Message CommandLineCommandRequired()
-        {
-            return Message(null, Ids.CommandLineCommandRequired, "A command is required. Add -h for list of available subcommands.");
-        }
 
-        public static Message CommandLineCommandRequired(string command)
-        {
-            return Message(null, Ids.CommandLineCommandRequired, "A subcommand is required for the \"{0}\" command. Add -h for list of available commands.", command);
-        }
 
-        public static Message ComponentExpectedFeature(SourceLineNumber sourceLineNumbers, string component, string type, string target)
-        {
-            return Message(sourceLineNumbers, Ids.ComponentExpectedFeature, "The component '{0}' is not assigned to a feature. The component's {1} '{2}' requires it to be assigned to at least one feature.", component, type, target);
-        }
 
-        public static Message ComponentMultipleKeyPaths(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, string fileElementName, string registryElementName, string odbcDataSourceElementName)
-        {
-            return Message(sourceLineNumbers, Ids.ComponentMultipleKeyPaths, "The {0} element has multiple key paths set. The key path may only be set to '{2}' in extension elements that support it or one of the following locations: {0}/@{1}, {3}/@{1}, {4}/@{1}, or {5}/@{1}.", elementName, attributeName, value, fileElementName, registryElementName, odbcDataSourceElementName);
-        }
 
-        public static Message ComponentReferencedTwice(SourceLineNumber sourceLineNumbers, string crefChildId)
-        {
-            return Message(sourceLineNumbers, Ids.ComponentReferencedTwice, "Component {0} cannot be contained in a Module twice.", crefChildId);
-        }
 
-        public static Message ConditionExpected(SourceLineNumber sourceLineNumbers, string elementName)
-        {
-            return Message(sourceLineNumbers, Ids.ConditionExpected, "The {0} element's inner text cannot be an empty string or completely whitespace. If you don't want a condition, then simply remove the entire {0} element.", elementName);
-        }
 
         public static Message CorruptFileFormat(string path, string format)
         {
             return Message(null, Ids.CorruptFileFormat, "Attempted to load corrupt file from path: {0}. The file with format {1} contained unexpected content. Ensure the correct path was provided and that the file has not been incorrectly modified.", path, format.ToLowerInvariant());
         }
 
-        public static Message CouldNotDetermineProductCodeFromTransformSummaryInfo()
-        {
-            return Message(null, Ids.CouldNotDetermineProductCodeFromTransformSummaryInfo, "Could not determine ProductCode from transform summary information.");
-        }
-
-        public static Message CreateCabAddFileFailed()
-        {
-            return Message(null, Ids.CreateCabAddFileFailed, "An error (E_FAIL) was returned while creating a CAB file. The most common cause of this error is attempting to create a CAB file larger than 2GB. You can reduce the size of your installation package, use a higher compression level, or split your files into more than one CAB file.");
-        }
-
-        public static Message CreateCabInsufficientDiskSpace()
-        {
-            return Message(null, Ids.CreateCabInsufficientDiskSpace, "An error (ERROR_DISK_FULL) was returned while creating a CAB file. This means you have insufficient disk space. Clear disk space and try again.");
-        }
-
-        public static Message CubeFileNotFound(string cubeFile)
-        {
-            return Message(null, Ids.CubeFileNotFound, "The cube file '{0}' cannot be found. This file is required for MSI validation.", cubeFile);
-        }
-
-        public static Message CustomActionMultipleSources(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeName1, string attributeName2, string attributeName3, string attributeName4, string attributeName5)
-        {
-            return Message(sourceLineNumbers, Ids.CustomActionMultipleSources, "The {0}/@{1} attribute cannot coexist with a previously specified attribute on this element. The {0} element may only have one of the following source attributes specified at a time: {2}, {3}, {4}, {5}, or {6}.", elementName, attributeName, attributeName1, attributeName2, attributeName3, attributeName4, attributeName5);
-        }
-
-        public static Message CustomActionMultipleTargets(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeName1, string attributeName2, string attributeName3, string attributeName4, string attributeName5, string attributeName6, string attributeName7)
-        {
-            return Message(sourceLineNumbers, Ids.CustomActionMultipleTargets, "The {0}/@{1} attribute cannot coexist with a previously specified attribute on this element. The {0} element may only have one of the following target attributes specified at a time: {2}, {3}, {4}, {5}, {6}, {7}, or {8}.", elementName, attributeName, attributeName1, attributeName2, attributeName3, attributeName4, attributeName5, attributeName6, attributeName7);
-        }
-
-        public static Message CustomActionSequencedInModule(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
-        {
-            return Message(sourceLineNumbers, Ids.CustomActionSequencedInModule, "The {0} table contains a custom action '{1}' that has a sequence number specified. The Sequence attribute is not allowed for custom actions in a merge module. Please remove the action or use the Before or After attributes to specify where this action should be sequenced relative to another action.", sequenceTableName, actionName);
-        }
-
-        public static Message CustomTableIllegalColumnWidth(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, int value)
-        {
-            return Message(sourceLineNumbers, Ids.CustomTableIllegalColumnWidth, "The {0}/@{1} attribute's value, '{2}', is not a valid column width. Valid column widths are 2 or 4.", elementName, attributeName, value);
-        }
-
-        public static Message CustomTableMissingPrimaryKey(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.CustomTableMissingPrimaryKey, "The CustomTable is missing a Column element with the PrimaryKey attribute set to 'yes'. At least one column must be marked as the primary key.");
-        }
-
-        public static Message CustomTableNameTooLong(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.CustomTableNameTooLong, "The {0}/@{1} attribute's value, '{2}', is too long for a table name. It cannot be more than than 31 characters long.", elementName, attributeName, value);
-        }
-
-        public static Message DatabaseSchemaMismatch(SourceLineNumber sourceLineNumbers, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.DatabaseSchemaMismatch, "The table definition of '{0}' in the target database does not match the table definition in the updated database. A transform requires that the target database schema match the updated database schema.", tableName);
-        }
-
-        public static Message DirectoryPathRequired(string parameter)
-        {
-            return Message(null, Ids.DirectoryPathRequired, "The parameter '{0}' must be followed by a directory path.", parameter);
-        }
-
-        public static Message DisallowedMsiProperty(SourceLineNumber sourceLineNumbers, string property, string illegalValueList)
-        {
-            return Message(sourceLineNumbers, Ids.DisallowedMsiProperty, "The '{0}' MsiProperty is controlled by the bootstrapper and cannot be authored. (Illegal properties are: {1}.) Remove the MsiProperty element.", property, illegalValueList);
-        }
-
-        public static Message DuplicateCabinetName(SourceLineNumber sourceLineNumbers, string cabinetName)
-        {
-            return Message(sourceLineNumbers, Ids.DuplicateCabinetName, "Duplicate cabinet name '{0}' found.", cabinetName);
-        }
-
-        public static Message DuplicateCabinetName2(SourceLineNumber sourceLineNumbers, string cabinetName)
-        {
-            return Message(sourceLineNumbers, Ids.DuplicateCabinetName2, "Duplicate cabinet name '{0}' error related to previous error.", cabinetName);
-        }
-
-        public static Message DuplicateComponentGuids(SourceLineNumber sourceLineNumbers, string componentId, string guid, string type, string keyPath)
-        {
-            return Message(sourceLineNumbers, Ids.DuplicateComponentGuids, "Component/@Id='{0}' with {2} '{3}' has a @Guid value '{1}' that duplicates another component in this package. It is recommended to give each component its own unique GUID.", componentId, guid, type, keyPath);
-        }
-
-        public static Message DuplicateContextValue(SourceLineNumber sourceLineNumbers, string contextValue)
-        {
-            return Message(sourceLineNumbers, Ids.DuplicateContextValue, "The context value '{0}' was duplicated. Context values must be distinct.", contextValue);
-        }
-
-        public static Message DuplicatedUiLocalization(SourceLineNumber sourceLineNumbers, string controlName, string dialogName)
-        {
-            return Message(sourceLineNumbers, Ids.DuplicatedUiLocalization, "The localization for control {0} in dialog {1} is duplicated. Only one localization per control is allowed.", controlName, dialogName);
-        }
-
-        public static Message DuplicatedUiLocalization(SourceLineNumber sourceLineNumbers, string dialogName)
-        {
-            return Message(sourceLineNumbers, Ids.DuplicatedUiLocalization, "The localization for dialog {0} is duplicated. Only one localization per dialog is allowed.", dialogName);
-        }
-
-        public static Message DuplicateExtensionPreprocessorType(string extension, string variablePrefix, string collidingExtension)
-        {
-            return Message(null, Ids.DuplicateExtensionPreprocessorType, "The extension '{0}' uses the same preprocessor variable prefix, '{1}', as previously loaded extension '{2}'. Please remove one of the extensions or rename the prefix to avoid the collision.", extension, variablePrefix, collidingExtension);
-        }
-
-        public static Message DuplicateExtensionTable(string extension, string tableName)
-        {
-            return Message(null, Ids.DuplicateExtensionTable, "The extension '{0}' contains a definition for table '{1}' that collides with a previously loaded table definition. Please remove one of the conflicting extensions or rename one of the tables to avoid the collision.", extension, tableName);
-        }
-
-        public static Message DuplicateExtensionXmlSchemaNamespace(string extension, string extensionXmlSchemaNamespace, string collidingExtension)
-        {
-            return Message(null, Ids.DuplicateExtensionXmlSchemaNamespace, "The extension '{0}' uses the same xml schema namespace, '{1}', as previously loaded extension '{2}'. Please either remove one of the extensions or rename the xml schema namespace to avoid the collision.", extension, extensionXmlSchemaNamespace, collidingExtension);
-        }
-
-        public static Message DuplicateFileId(string fileId)
-        {
-            return Message(null, Ids.DuplicateFileId, "Multiple files with ID '{0}' exist. Windows Installer does not support file IDs that differ only by case. Change the file IDs to be unique.", fileId);
-        }
-
-        public static Message DuplicateLocalizationIdentifier(SourceLineNumber sourceLineNumbers, string localizationId)
-        {
-            return Message(sourceLineNumbers, Ids.DuplicateLocalizationIdentifier, "The localization identifier '{0}' has been duplicated in multiple locations. A common cause is a bundle .wixproj that automatically loads .wxl files that are intended for the bootstrapper application. You can turn off that behavior by setting the EnableDefaultEmbeddedResourceItems property to false.", localizationId);
-        }
-
-        public static Message DuplicateModuleCaseInsensitiveFileIdentifier(SourceLineNumber sourceLineNumbers, string moduleId, string fileId1, string fileId2)
-        {
-            return Message(sourceLineNumbers, Ids.DuplicateModuleCaseInsensitiveFileIdentifier, "The merge module '{0}' contains 2 or more file identifiers that only differ by case: '{1}' and '{2}'. The WiX toolset extracts merge module files to the file system using these identifiers. Since most file systems are not case-sensitive a collision is likely. Please contact the owner of the merge module for a fix.", moduleId, fileId1, fileId2);
-        }
-
-        public static Message DuplicateModuleFileIdentifier(SourceLineNumber sourceLineNumbers, string moduleId, string fileId)
-        {
-            return Message(sourceLineNumbers, Ids.DuplicateModuleFileIdentifier, "The merge module '{0}' contains a file identifier, '{1}', that is duplicated either in another merge module or in a File/@Id attribute. File identifiers must be unique. Please change one of the file identifiers to a different value.", moduleId, fileId);
-        }
-
-        public static Message DuplicatePrimaryKey(SourceLineNumber sourceLineNumbers, string primaryKey, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.DuplicatePrimaryKey, "The primary key '{0}' is duplicated in table '{1}'. Please remove one of the entries or rename a part of the primary key to avoid the collision.", primaryKey, tableName);
-        }
-
-        public static Message DuplicateProviderDependencyKey(string providerKey, string packageId)
-        {
-            return Message(null, Ids.DuplicateProviderDependencyKey, "The provider dependency key '{0}' was already imported from the package with Id '{1}'. Please remove the Provides element with the key '{0}' from the package authoring.", providerKey, packageId);
-        }
-
-        public static Message DuplicateSourcesForOutput(string sourceList, string outputFile)
-        {
-            return Message(null, Ids.DuplicateSourcesForOutput, "Multiple source files ({0}) have resulted in the same output file '{1}'. This is likely because the source files only differ in extension or path. Rename the source files to avoid this problem.", sourceList, outputFile);
-        }
-
-        public static Message DuplicateTransform(string transform)
-        {
-            return Message(null, Ids.DuplicateTransform, "The transform {0} was included twice on the command line. Each transform can be applied to a patch only once.", transform);
-        }
-
-        public static Message DuplicateVariableDefinition(string variableName, string variableValue, string variableCollidingValue)
-        {
-            return Message(null, Ids.DuplicateVariableDefinition, "The variable '{0}' with value '{1}' was previously declared with value '{2}'.", variableName, variableValue, variableCollidingValue);
-        }
-
-        public static Message ExampleGuid(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.ExampleGuid, "The {0}/@{1} attribute's value, '{2}', is not a legal Guid value. A Guid needs to be generated and put in place of '{2}' in the source file.", elementName, attributeName, value);
-        }
-
-        public static Message ExpectedArgument(string argument)
-        {
-            return Message(null, Ids.ExpectedArgument, "{0} is expected to be followed by a value. See -? for additional detail.", argument);
-        }
-
         public static Message ExpectedAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
         {
             return Message(sourceLineNumbers, Ids.ExpectedAttribute, "The {0}/@{1} attribute was not found; it is required.", elementName, attributeName);
@@ -363,46 +46,6 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.ExpectedAttribute, "The {0}/@{1} attribute was not found; it is required unless the attribute {2} has a value of '{3}'.", elementName, attributeName, otherAttributeName, otherAttributeValue, otherAttributeValueUnless);
         }
 
-        public static Message ExpectedAttributeInElementOrParent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
-        {
-            return Message(sourceLineNumbers, Ids.ExpectedAttributeInElementOrParent, "The {0}/@{1} attribute was not found or empty; it is required unless it is specified in the parent element.", elementName, attributeName);
-        }
-
-        public static Message ExpectedAttributeInElementOrParent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string parentElementName)
-        {
-            return Message(sourceLineNumbers, Ids.ExpectedAttributeInElementOrParent, "The {0}/@{1} attribute was not found or empty; it is required, or it can be specified in the parent {2} element.", elementName, attributeName, parentElementName);
-        }
-
-        public static Message ExpectedAttributeInElementOrParent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string parentElementName, string parentAttributeName)
-        {
-            return Message(sourceLineNumbers, Ids.ExpectedAttributeInElementOrParent, "The {0}/@{1} attribute was not found or empty; it is required, or it can be specified in the parent {2}/@{3} attribute.", elementName, attributeName, parentElementName, parentAttributeName);
-        }
-
-        public static Message ExpectedAttributeWithValueWithOtherAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeName2)
-        {
-            return Message(sourceLineNumbers, Ids.ExpectedAttributeWithValueWithOtherAttribute, "The {0}/@{1} attribute is required to have a value when attribute {2} is present.", elementName, attributeName, attributeName2);
-        }
-
-        public static Message ExpectedAttributeOrElement(SourceLineNumber sourceLineNumbers, string parentElement, string attribute, string childElement)
-        {
-            return Message(sourceLineNumbers, Ids.ExpectedAttributeOrElement, "Element '{0}' missing attribute '{1}' or child element '{2}'. Exactly one of those is required.", parentElement, attribute, childElement);
-        }
-
-        public static Message ExpectedAttributeOrElementWithOtherAttribute(SourceLineNumber sourceLineNumbers, string parentElement, string attribute, string childElement, string otherAttribute)
-        {
-            return Message(sourceLineNumbers, Ids.ExpectedAttributeOrElementWithOtherAttribute, "Element '{0}' missing attribute '{1}' or child element '{2}'. Exactly one of those is required when attribute '{3}' is specified.", parentElement, attribute, childElement, otherAttribute);
-        }
-
-        public static Message ExpectedAttributeOrElementWithOtherAttribute(SourceLineNumber sourceLineNumbers, string parentElement, string attribute, string childElement, string otherAttribute, string otherAttributeValue)
-        {
-            return Message(sourceLineNumbers, Ids.ExpectedAttributeOrElementWithOtherAttribute, "Element '{0}' missing attribute '{1}' or child element '{2}'. Exactly one of those is required when attribute '{3}' is specified with value '{4}'.", parentElement, attribute, childElement, otherAttribute, otherAttributeValue);
-        }
-
-        public static Message ExpectedAttributeOrElementWithoutOtherAttribute(SourceLineNumber sourceLineNumbers, string parentElement, string attribute, string childElement, string otherAttribute)
-        {
-            return Message(sourceLineNumbers, Ids.ExpectedAttributeOrElementWithoutOtherAttribute, "Element '{0}' missing attribute '{1}' or child element '{2}'. Exactly one of those is required when attribute '{3}' is not specified.", parentElement, attribute, childElement, otherAttribute);
-        }
-
         public static Message ExpectedAttributes(SourceLineNumber sourceLineNumbers, string elementName, string attributeName1, string attributeName2)
         {
             return Message(sourceLineNumbers, Ids.ExpectedAttributes, "The {0} element's {1} or {2} attribute was not found; one of these is required.", elementName, attributeName1, attributeName2);
@@ -448,54 +91,54 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.ExpectedAttributesWithOtherAttribute, "The {0} element's {1} or {2} attribute was not found; one of these is required when attribute {3} has a value of '{4}'.", elementName, attributeName1, attributeName2, otherAttributeName, otherAttributeValue);
         }
 
-        public static Message ExpectedAttributesWithoutOtherAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName1, string attributeName2, string otherAttributeName)
+        public static Message ExpectedAttributeInElementOrParent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
         {
-            return Message(sourceLineNumbers, Ids.ExpectedAttributesWithoutOtherAttribute, "The {0} element's {1} or {2} attribute was not found; one of these is required without attribute {3} present.", elementName, attributeName1, attributeName2, otherAttributeName);
+            return Message(sourceLineNumbers, Ids.ExpectedAttributeInElementOrParent, "The {0}/@{1} attribute was not found or empty; it is required unless it is specified in the parent element.", elementName, attributeName);
         }
 
-        public static Message ExpectedAttributeWhenElementNotUnderElement(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string parentElementName)
+        public static Message ExpectedAttributeInElementOrParent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string parentElementName)
         {
-            return Message(sourceLineNumbers, Ids.ExpectedAttributeWhenElementNotUnderElement, "The '{0}/@{1}' attribute was not found; it is required when element '{0}' is not nested under a '{2}' element.", elementName, attributeName, parentElementName);
+            return Message(sourceLineNumbers, Ids.ExpectedAttributeInElementOrParent, "The {0}/@{1} attribute was not found or empty; it is required, or it can be specified in the parent {2} element.", elementName, attributeName, parentElementName);
         }
 
-        public static Message ExpectedAttributeWithElement(SourceLineNumber sourceLineNumbers, string elementName, string attribute, string childElementName)
+        public static Message ExpectedAttributeInElementOrParent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string parentElementName, string parentAttributeName)
         {
-            return Message(sourceLineNumbers, Ids.ExpectedAttributeWithElement, "The {0} element must have attribute '{1}' when child element '{2}' is present.", elementName, attribute, childElementName);
+            return Message(sourceLineNumbers, Ids.ExpectedAttributeInElementOrParent, "The {0}/@{1} attribute was not found or empty; it is required, or it can be specified in the parent {2}/@{3} attribute.", elementName, attributeName, parentElementName, parentAttributeName);
         }
 
-        public static Message ExpectedAttributeWithoutOtherAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string otherAttributeName)
+        public static Message ExpectedAttributeWithValueWithOtherAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeName2)
         {
-            return Message(sourceLineNumbers, Ids.ExpectedAttributeWithoutOtherAttributes, "The {0} element's {1} attribute was not found; it is required without attribute {2} present.", elementName, attributeName, otherAttributeName);
+            return Message(sourceLineNumbers, Ids.ExpectedAttributeWithValueWithOtherAttribute, "The {0}/@{1} attribute is required to have a value when attribute {2} is present.", elementName, attributeName, attributeName2);
         }
 
-        public static Message ExpectedAttributeWithoutOtherAttributes(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string otherAttributeName1, string otherAttributeName2)
+        public static Message ExpectedAttributeOrElementWithOtherAttribute(SourceLineNumber sourceLineNumbers, string parentElement, string attribute, string childElement, string otherAttribute)
         {
-            return Message(sourceLineNumbers, Ids.ExpectedAttributeWithoutOtherAttributes, "The {0} element's {1} attribute was not found; it is required without attribute {2} or {3} present.", elementName, attributeName, otherAttributeName1, otherAttributeName2);
+            return Message(sourceLineNumbers, Ids.ExpectedAttributeOrElementWithOtherAttribute, "Element '{0}' missing attribute '{1}' or child element '{2}'. Exactly one of those is required when attribute '{3}' is specified.", parentElement, attribute, childElement, otherAttribute);
         }
 
-        public static Message ExpectedBinaryCategory(SourceLineNumber sourceLineNumbers)
+        public static Message ExpectedAttributeOrElementWithOtherAttribute(SourceLineNumber sourceLineNumbers, string parentElement, string attribute, string childElement, string otherAttribute, string otherAttributeValue)
         {
-            return Message(sourceLineNumbers, Ids.ExpectedBinaryCategory, "The Column element specifies a binary column but does not have the correct Category specified. Windows Installer requires binary columns to specify their category as binary. Please set the Category attribute's value to 'Binary'.");
+            return Message(sourceLineNumbers, Ids.ExpectedAttributeOrElementWithOtherAttribute, "Element '{0}' missing attribute '{1}' or child element '{2}'. Exactly one of those is required when attribute '{3}' is specified with value '{4}'.", parentElement, attribute, childElement, otherAttribute, otherAttributeValue);
         }
 
-        public static Message ExpectedClientPatchIdInWixMsp()
+        public static Message ExpectedAttributeOrElementWithoutOtherAttribute(SourceLineNumber sourceLineNumbers, string parentElement, string attribute, string childElement, string otherAttribute)
         {
-            return Message(null, Ids.ExpectedClientPatchIdInWixMsp, "The WixMsp is missing the client patch ID. Recompile the patch source files with the latest WiX toolset.");
+            return Message(sourceLineNumbers, Ids.ExpectedAttributeOrElementWithoutOtherAttribute, "Element '{0}' missing attribute '{1}' or child element '{2}'. Exactly one of those is required when attribute '{3}' is not specified.", parentElement, attribute, childElement, otherAttribute);
         }
 
-        public static Message ExpectedDecompiler(string identifier)
+        public static Message ExpectedAttributesWithoutOtherAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName1, string attributeName2, string otherAttributeName)
         {
-            return Message(null, Ids.ExpectedDecompiler, "No decompiler was provided. {0} requires a decompiler.", identifier);
+            return Message(sourceLineNumbers, Ids.ExpectedAttributesWithoutOtherAttribute, "The {0} element's {1} or {2} attribute was not found; one of these is required without attribute {3} present.", elementName, attributeName1, attributeName2, otherAttributeName);
         }
 
-        public static Message ExpectedDirectory(string directory)
+        public static Message ExpectedAttributeWhenElementNotUnderElement(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string parentElementName)
         {
-            return Message(null, Ids.ExpectedDirectory, "The directory '{0}' could not be found.", directory);
+            return Message(sourceLineNumbers, Ids.ExpectedAttributeWhenElementNotUnderElement, "The '{0}/@{1}' attribute was not found; it is required when element '{0}' is not nested under a '{2}' element.", elementName, attributeName, parentElementName);
         }
 
-        public static Message ExpectedDirectoryGotFile(string option, string path)
+        public static Message ExpectedAttributeWithoutOtherAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string otherAttributeName)
         {
-            return Message(null, Ids.ExpectedDirectoryGotFile, "The {0} option requires a directory, but the provided path is a file: {1}", option, path);
+            return Message(sourceLineNumbers, Ids.ExpectedAttributeWithoutOtherAttributes, "The {0} element's {1} attribute was not found; it is required without attribute {2} present.", elementName, attributeName, otherAttributeName);
         }
 
         public static Message ExpectedElement(SourceLineNumber sourceLineNumbers, string elementName)
@@ -523,101 +166,11 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.ExpectedElement, "A {0} element must have at least one child element of type {1}, {2}, {3}, or {4}.", elementName, childName1, childName2, childName3, childName4);
         }
 
-        public static Message ExpectedEndElement(SourceLineNumber sourceLineNumbers, string elementName)
-        {
-            return Message(sourceLineNumbers, Ids.ExpectedEndElement, "The end element matching the '{0}' start element was not found.", elementName);
-        }
-
-        public static Message ExpectedEndforeach(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.ExpectedEndforeach, "A <?foreach?> statement was found that had no matching <?endforeach?>.");
-        }
-
-        public static Message ExpectedExpressionAfterNot(SourceLineNumber sourceLineNumbers, string expression)
-        {
-            return Message(sourceLineNumbers, Ids.ExpectedExpressionAfterNot, "Expecting an argument for 'NOT' in expression '{0}'.", expression);
-        }
-
-        public static Message ExpectedFileGotDirectory(string option, string path)
-        {
-            return Message(null, Ids.ExpectedFileGotDirectory, "The {0} option requires a file, but the provided path is a directory: {1}", option, path);
-        }
-
-        public static Message ExpectedMediaCabinet(SourceLineNumber sourceLineNumbers, string fileId, int diskId)
-        {
-            return Message(sourceLineNumbers, Ids.ExpectedMediaCabinet, "The file '{0}' should be compressed but is not part of a compressed media. Files will be compressed if either the File/@Compressed or Package/@Compressed attributes are set to 'yes'. This can be fixed by setting the Media/@Cabinet attribute for media '{1}'.", fileId, diskId);
-        }
-
-        public static Message ExpectedMediaRowsInWixMsp()
-        {
-            return Message(null, Ids.ExpectedMediaRowsInWixMsp, "The WixMsp has no media rows defined.");
-        }
-
         public static Message ExpectedParentWithAttribute(SourceLineNumber sourceLineNumbers, string parentElement, string attribute, string grandparentElement)
         {
             return Message(sourceLineNumbers, Ids.ExpectedParentWithAttribute, "When the {0}/@{1} attribute is specified, the {0} element must be nested under a {2} element.", parentElement, attribute, grandparentElement);
         }
 
-        public static Message ExpectedPatchIdInWixMsp()
-        {
-            return Message(null, Ids.ExpectedPatchIdInWixMsp, "The WixMsp is missing the patch ID.");
-        }
-
-        public static Message ExpectedSignedCabinetName(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.ExpectedSignedCabinetName, "The Media/@Cabinet attribute was not found; it is required when this element contains a DigitalSignature child element. This is because Windows Installer can only verify the digital signatures of external cabinets. Please either remove the DigitalSignature element or specify a valid external cabinet name via the Cabinet attribute.");
-        }
-
-        public static Message ExpectedTableInMergeModule(string identifier)
-        {
-            return Message(null, Ids.ExpectedTableInMergeModule, "The table '{0}' was expected but was missing.", identifier);
-        }
-
-        public static Message ExpectedVariable(SourceLineNumber sourceLineNumbers, string expression)
-        {
-            return Message(sourceLineNumbers, Ids.ExpectedVariable, "A required variable was missing in the expression '{0}'.", expression);
-        }
-
-        public static Message ExpectedBindVariableValue(string variableId)
-        {
-            return Message(null, Ids.ExpectedBindVariableValue, "The bind variable '{0}' was declared without a value. Please specify a value for the variable.", variableId);
-        }
-
-        public static Message FamilyNameTooLong(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, int length)
-        {
-            return Message(sourceLineNumbers, Ids.FamilyNameTooLong, "The {0}/@{1} attribute's value, '{2}', is {3} characters long. This is too long for a family name because the maximum allowed length is 8 characters long.", elementName, attributeName, value, length);
-        }
-
-        public static Message FeatureCannotFavorAndDisallowAdvertise(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, string otherAttributeName, string otherValue)
-        {
-            return Message(sourceLineNumbers, Ids.FeatureCannotFavorAndDisallowAdvertise, "The {0}/@{1} attribute's value, '{2}', cannot coexist with the {3} attribute's value of '{4}'. These options would ask the installer to disallow the advertised state for this feature while at the same time favoring it.", elementName, attributeName, value, otherAttributeName, otherValue);
-        }
-
-        public static Message FeatureCannotFollowParentAndFavorLocalOrSource(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string otherAttributeName, string otherValue)
-        {
-            return Message(sourceLineNumbers, Ids.FeatureCannotFollowParentAndFavorLocalOrSource, "The {0}/@{1} attribute cannot be specified if the {2} attribute's value is '{3}'. These options would ask the installer to force this feature to follow the parent installation state and simultaneously favor a particular installation state just for this feature.", elementName, attributeName, otherAttributeName, otherValue);
-        }
-
-        public static Message FeatureConfigurableDirectoryNotUppercase(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.FeatureConfigurableDirectoryNotUppercase, "The {0}/@{1} attribute's value, '{2}', contains lowercase characters. Since this directory is user-configurable, it needs to be a public property. This means the value must be completely uppercase.", elementName, attributeName, value);
-        }
-
-        public static Message FeatureNameTooLong(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue)
-        {
-            return Message(sourceLineNumbers, Ids.FeatureNameTooLong, "The {0}/@{1} attribute with value '{2}', is too long for a feature name. Due to limitations in the Windows Installer, feature names cannot be longer than 38 characters in length.", elementName, attributeName, attributeValue);
-        }
-
-        public static Message FileIdentifierNotFound(SourceLineNumber sourceLineNumbers, string fileIdentifier)
-        {
-            return Message(sourceLineNumbers, Ids.FileIdentifierNotFound, "The file row with identifier '{0}' could not be found.", fileIdentifier);
-        }
-
-        public static Message FileInUse(SourceLineNumber sourceLineNumbers, string file)
-        {
-            return Message(sourceLineNumbers, Ids.FileInUse, "The process can not access the file '{0}' because it is being used by another process.", file);
-        }
-
         public static Message FileNotFound(SourceLineNumber sourceLineNumbers, string file)
         {
             return Message(sourceLineNumbers, Ids.FileNotFound, "Cannot find the file '{0}'.", file);
@@ -635,86 +188,16 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.FileNotFound, "Cannot find the {0}file '{1}'. The following paths were checked: {2}", fileTypePrefix, file, combinedCheckedPaths);
         }
 
-        public static Message FileOrDirectoryPathRequired(string parameter)
-        {
-            return Message(null, Ids.FileOrDirectoryPathRequired, "The parameter '{0}' must be followed by a file or directory path. To specify a directory path the string must end with a backslash, for example: \"C:\\Path\\\".", parameter);
-        }
-
-        public static Message FilePathRequired(string filePurpose)
-        {
-            return Message(null, Ids.FilePathRequired, "The path to the {0} is required.", filePurpose);
-        }
-
-        public static Message FilePathRequired(string parameter, string filePurpose)
-        {
-            return Message(null, Ids.FilePathRequired, "The parameter '{0}' must be followed by a file path for the {1}.", parameter, filePurpose);
-        }
-
-        public static Message FileTooLarge(SourceLineNumber sourceLineNumbers, string fileName)
-        {
-            return Message(sourceLineNumbers, Ids.FileTooLarge, "'{0}' is too large, file size must be less than 2147483648.", fileName);
-        }
-
-        public static Message FileWriteError(string path, string error)
-        {
-            return Message(null, Ids.FileWriteError, "Error writing to the path: '{0}'. Error message: '{1}'", path, error);
-        }
-
-        public static Message FinishCabFailed()
-        {
-            return Message(null, Ids.FinishCabFailed, "An error (E_FAIL) was returned while finalizing a CAB file. This most commonly happens when creating a CAB file with more than 65535 files in it or a compressed size greater than 2GB. Either reduce the number of files in your installation package or split your installation package's files into more than one CAB file using the Media element.");
-        }
-
-        public static Message FullTempDirectory(string prefix, string directory)
-        {
-            return Message(null, Ids.FullTempDirectory, "Unable to create temporary file. A common cause is that too many files that have names beginning with '{0}' are present. Delete any unneeded files in the '{1}' directory and try again.", prefix, directory);
-        }
-
-        public static Message GACAssemblyIdentityWarning(SourceLineNumber sourceLineNumbers, string fileName, string assemblyName)
-        {
-            return Message(sourceLineNumbers, Ids.GACAssemblyIdentityWarning, "The destination name of file '{0}' does not match its assembly name '{1}' in your authoring. This will cause an installation failure for this assembly, because it will be installed to the Global Assembly Cache. To fix this error, update File/@Name of file '{0}' to be the actual name of the assembly.", fileName, assemblyName);
-        }
-
-        public static Message GacAssemblyNoStrongName(SourceLineNumber sourceLineNumbers, string assemblyName, string componentName)
-        {
-            return Message(sourceLineNumbers, Ids.GacAssemblyNoStrongName, "Assembly {0} in component {1} has no strong name and has been marked to be placed in the GAC. All assemblies installed to the GAC must have a valid strong name.", assemblyName, componentName);
-        }
-
         public static Message GenericReadNotAllowed(SourceLineNumber sourceLineNumbers)
         {
             return Message(sourceLineNumbers, Ids.GenericReadNotAllowed, "Permission elements cannot have GenericRead as the only permission specified. Include at least one other permission.");
         }
 
-        public static Message GuidContainsLowercaseLetters(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.GuidContainsLowercaseLetters, "The {0}/@{1} attribute's value, '{2}', is a mixed-case guid. All letters in a guid value should be uppercase.", elementName, attributeName, value);
-        }
-
-        public static Message HarvestSourceNotSpecified()
-        {
-            return Message(null, Ids.HarvestSourceNotSpecified, "A harvest source must be specified after the harvest type and can be followed by harvester arguments.");
-        }
-
-        public static Message IdentifierNotFound(string type, string identifier)
-        {
-            return Message(null, Ids.IdentifierNotFound, "An expected identifier ('{1}', of type '{0}') was not found.", type, identifier);
-        }
-
-        public static Message IdentifierTooLongError(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, int maxLength)
-        {
-            return Message(sourceLineNumbers, Ids.IdentifierTooLongError, "The {0}/@{1} attribute's value, '{2}', is too long. {0}/@{1} attribute's must be {3} characters long or less.", elementName, attributeName, value, maxLength);
-        }
-
         public static Message IllegalAttributeExceptOnElement(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string expectedElementName)
         {
             return Message(sourceLineNumbers, Ids.IllegalAttributeExceptOnElement, "The {1} attribute can only be specified on the {2} element.", elementName, attributeName, expectedElementName);
         }
 
-        public static Message IllegalAttributeInMergeModule(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalAttributeInMergeModule, "The {0}/@{1} attribute cannot be specified in a merge module.", elementName, attributeName);
-        }
-
         public static Message IllegalAttributeValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, params string[] legalValues)
         {
             return Message(sourceLineNumbers, Ids.IllegalAttributeValue, "The {0}/@{1} attribute's value, '{2}', is not one of the legal options: '{3}'.", elementName, attributeName, value, String.Join(", ", legalValues));
@@ -725,11 +208,6 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.IllegalAttributeValueWhenNested, "The {0}/@{1} attribute value, '{2}', cannot be specified when the {0} element is nested underneath a {3} element.", elementName, attributeName, attrivuteValue, parentElementName);
         }
 
-        public static Message IllegalAttributeValueWithIllegalList(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, string illegalValueList)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalAttributeValueWithIllegalList, "The {0}/@{1} attribute's value, '{2}', is one of the illegal options: {3}.", elementName, attributeName, value, illegalValueList);
-        }
-
         public static Message IllegalAttributeValueWithLegalList(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, string legalValueList)
         {
             return Message(sourceLineNumbers, Ids.IllegalAttributeValueWithLegalList, "The {0}/@{1} attribute's value, '{2}', is not one of the legal options: {3}.", elementName, attributeName, value, legalValueList);
@@ -755,21 +233,11 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.IllegalAttributeValueWithoutOtherAttribute, "The {0}/@{1} attribute's value, '{2}', cannot be specified without attribute {3} present.", elementName, attributeName, attributeValue, otherAttributeName);
         }
 
-        public static Message IllegalAttributeWhenAdvertised(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalAttributeWhenAdvertised, "The {0}/@{1} attribute cannot be specified because the element is advertised.", elementName, attributeName);
-        }
-
         public static Message IllegalAttributeWhenNested(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string parentElement)
         {
             return Message(sourceLineNumbers, Ids.IllegalAttributeWhenNested, "The {0}/@{1} attribute cannot be specified when the {0} element is nested underneath a {2} element. If this {0} is a member of a ComponentGroup where ComponentGroup/@{1} is set, then the {0}/@{1} attribute should be removed.", elementName, attributeName, parentElement);
         }
 
-        public static Message IllegalAttributeWithInnerText(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalAttributeWithInnerText, "The {0}/@{1} attribute cannot be specified when the element has body text as well. Specify either the attribute or the body, but not both.", elementName, attributeName);
-        }
-
         public static Message IllegalAttributeWithOtherAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string otherAttributeName)
         {
             return Message(sourceLineNumbers, Ids.IllegalAttributeWithOtherAttribute, "The {0}/@{1} attribute cannot be specified when attribute {2} is present.", elementName, attributeName, otherAttributeName);
@@ -820,47 +288,6 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.IllegalAttributeWithoutOtherAttributes, "The {0}/@{1} attribute can only be specified with one of the following attributes: {2}, {3}, {4}, or {5} present.", elementName, attributeName, otherAttributeName1, otherAttributeName2, otherAttributeName3, otherAttributeName4);
         }
 
-        public static Message IllegalBinderClassName()
-        {
-            return Message(null, Ids.IllegalBinderClassName, "Illegal binder class name specified for -binder command line option.");
-        }
-
-        public static Message IllegalCabbingThreadCount(string numThreads)
-        {
-            return Message(null, Ids.IllegalCabbingThreadCount, "Illegal number of threads to create cabinets: '{0}' for -ct <N> command line option. Specify the number of threads to use like -ct 2.", numThreads);
-        }
-
-        public static Message IllegalCharactersInPath(string pathName)
-        {
-            return Message(null, Ids.IllegalCharactersInPath, "Illegal characters in path '{0}'. Ensure you provided a valid path to the file.", pathName);
-        }
-
-        public static Message IllegalCodepage(int codepage)
-        {
-            return Message(null, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, or WixLocalization/@Codepage.", codepage);
-        }
-
-        public static Message IllegalCodepage(SourceLineNumber sourceLineNumbers, int codepage)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, or WixLocalization/@Codepage.", codepage);
-        }
-
-        public static Message IllegalCodepageAttribute(SourceLineNumber sourceLineNumbers, string codepage, string elementName, string attributeName)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalCodepageAttribute, "The code page '{0}' is not a valid Windows code page. Please check the {1}/@{2} attribute value in your source file.", codepage, elementName, attributeName);
-        }
-
-        public static Message IllegalColumnName(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalColumnName, "The {0}/@{1} attribute's value, '{2}', is not a legal column name. It will collide with the sentinel values used in the _TransformView table.", elementName, attributeName, value);
-        }
-
-        public static Message IllegalCommandLineArgumentValue(string arg, string value, IEnumerable<string> validValues)
-        {
-            var combinedValidValues = String.Join(", ", validValues);
-            return Message(null, Ids.IllegalCommandLineArgumentValue, "The argument {0} value '{1}' is invalid. Use one of the following values {2}", arg, value, combinedValidValues);
-        }
-
         public static Message IllegalComponentWithAutoGeneratedGuid(SourceLineNumber sourceLineNumbers)
         {
             return Message(sourceLineNumbers, Ids.IllegalComponentWithAutoGeneratedGuid, "The Component/@Guid attribute's value '*' is not valid for this component because it does not meet the criteria for having an automatically generated guid. Components using a Directory as a KeyPath or containing ODBCDataSource child elements cannot use an automatically generated guid. Make sure your component doesn't have a Directory as the KeyPath and move any ODBCDataSource child elements to components with explicit component guids.");
@@ -871,16 +298,6 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.IllegalComponentWithAutoGeneratedGuid, "The Component/@Guid attribute's value '*' is not valid for this component because it does not meet the criteria for having an automatically generated guid. Components with registry keypaths and files cannot use an automatically generated guid. Create multiple components, each with one file and/or one registry value keypath, to use automatically generated guids.", registryKeyPath);
         }
 
-        public static Message IllegalCompressionLevel(SourceLineNumber sourceLineNumbers, string compressionLevel)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalCompressionLevel, "The compression level '{0}' is not valid. Valid values are 'none', 'low', 'medium', 'high', and 'mszip'.", compressionLevel);
-        }
-
-        public static Message IllegalDefineStatement(SourceLineNumber sourceLineNumbers, string defineStatement)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalDefineStatement, "The define statement '<?define {0}?>' is not well-formed. Define statements should be in the form <?define variableName = \"variable value\"?>.", defineStatement);
-        }
-
         public static Message IllegalEmptyAttributeValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
         {
             return Message(sourceLineNumbers, Ids.IllegalEmptyAttributeValue, "The {0}/@{1} attribute's value cannot be an empty string. If a value is not required, simply remove the entire attribute.", elementName, attributeName);
@@ -891,41 +308,11 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.IllegalEmptyAttributeValue, "The {0}/@{1} attribute's value cannot be an empty string. To use the default value \"{2}\", simply remove the entire attribute.", elementName, attributeName, defaultValue);
         }
 
-        public static Message IllegalEnvironmentVariable(string environmentVariable, string value)
-        {
-            return Message(null, Ids.IllegalEnvironmentVariable, "The {0} environment variable is set to an invalid value of '{1}'.", environmentVariable, value);
-        }
-
-        public static Message IllegalFamilyName(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalFamilyName, "The {0}/@{1} attribute's value, '{2}', contains illegal characters for a family name. Legal values include letters, numbers, and underscores.", elementName, attributeName, value);
-        }
-
         public static Message IllegalFileCompressionAttributes(SourceLineNumber sourceLineNumbers)
         {
             return Message(sourceLineNumbers, Ids.IllegalFileCompressionAttributes, "Cannot have both the MsidbFileAttributesCompressed and MsidbFileAttributesNoncompressed options set in a file attributes column.");
         }
 
-        public static Message IllegalForeach(SourceLineNumber sourceLineNumbers, string foreachStatement)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalForeach, "The foreach statement '{0}' is illegal. The proper format for foreach is <?foreach varName in valueList?>.", foreachStatement);
-        }
-
-        public static Message IllegalGeneratedGuidComponentUnversionedKeypath(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalGeneratedGuidComponentUnversionedKeypath, "The Component/@Guid attribute's value '*' is not valid for this component because it does not meet the criteria for having an automatically generated guid. Components with more than one file cannot use an automatically generated guid unless a versioned file is the keypath and the other files are unversioned. This component's keypath is not versioned. Create multiple components to use automatically generated guids.");
-        }
-
-        public static Message IllegalGeneratedGuidComponentVersionedNonkeypath(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalGeneratedGuidComponentVersionedNonkeypath, "The Component/@Guid attribute's value '*' is not valid for this component because it does not meet the criteria for having an automatically generated guid. Components with more than one file cannot use an automatically generated guid unless a versioned file is the keypath and the other files are unversioned. This component has a non-keypath file that is versioned. Create multiple components to use automatically generated guids.");
-        }
-
-        public static Message IllegalGuidValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalGuidValue, "The {0}/@{1} attribute's value, '{2}', is not a legal guid value.", elementName, attributeName, value);
-        }
-
         public static Message IllegalIdentifier(SourceLineNumber sourceLineNumbers, string elementName, string value)
         {
             return Message(sourceLineNumbers, Ids.IllegalIdentifier, "The {0} element's value, '{1}', is not a legal identifier. Identifiers may contain ASCII characters A-Z, a-z, digits, underscores (_), or periods (.). Every identifier must begin with either a letter or an underscore.", elementName, value);
@@ -946,21 +333,6 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.IllegalIdentifier, "The {0}/@{1} attribute's value '{2}' contains an illegal identifier '{3}'. Identifiers may contain ASCII characters A-Z, a-z, digits, underscores (_), or periods (.). Every identifier must begin with either a letter or an underscore.", elementName, attributeName, value, identifier);
         }
 
-        public static Message IllegalIdentifierLooksLikeFormatted(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalIdentifierLooksLikeFormatted, "The {0}/@{1} attribute's value, '{2}', is not a legal identifier. The {0}/@{1} attribute does not support formatted string values, such as property names enclosed in brackets ([LIKETHIS]). The value must be the identifier of another element, such as the Directory/@Id attribute value.", elementName, attributeName, value);
-        }
-
-        public static Message IllegalInlineLocVariable(SourceLineNumber sourceLineNumbers, string variableName, string variableValue)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalInlineLocVariable, "The localization variable '{0}' specifies an illegal inline default value of '{1}'. Localization variables cannot specify default values inline, instead the value should be specified in a WiX localization (.wxl) file.", variableName, variableValue);
-        }
-
-        public static Message IllegalIntegerInExpression(SourceLineNumber sourceLineNumbers, string expression)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalIntegerInExpression, "An illegal number was found in the expression '{0}'.", expression);
-        }
-
         public static Message IllegalIntegerValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
         {
             return Message(sourceLineNumbers, Ids.IllegalIntegerValue, "The {0}/@{1} attribute's value, '{2}', is not a legal integer value. Legal integer values are from -2,147,483,648 to 2,147,483,647.", elementName, attributeName, value);
@@ -976,94 +348,24 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.IllegalLongFilename, "The {0}/@{1} attribute's value '{2}' contains a invalid filename '{3}'. Legal filenames contain no more than 260 characters and must contain at least one non-period character. Any character except for the follow may be used: \\ ? | > < : / * \".", elementName, attributeName, value, filename);
         }
 
-        public static Message IllegalLongValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalLongValue, "The {0}/@{1} attribute's value, '{2}', is not a legal long value. Legal long values are from -9,223,372,036,854,775,808 to 9,223,372,036,854,775,807.", elementName, attributeName, value);
-        }
-
-        public static Message IllegalModuleExclusionLanguageAttributes(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalModuleExclusionLanguageAttributes, "Cannot set both ExcludeLanguage and ExcludeExceptLanguage attributes on a ModuleExclusion element.");
-        }
-
         public static Message IllegalParentAttributeWhenNested(SourceLineNumber sourceLineNumbers, string parentElementName, string parentAttributeName, string childElement)
         {
             return Message(sourceLineNumbers, Ids.IllegalParentAttributeWhenNested, "The {0}/@{1} attribute cannot be specified when a {2} element is nested underneath the {0} element.", parentElementName, parentAttributeName, childElement);
         }
 
-        public static Message IllegalPathForGeneratedComponentGuid(SourceLineNumber sourceLineNumbers, string componentName, string keyFilePath)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalPathForGeneratedComponentGuid, "The component '{0}' has a key file with path '{1}'. Since this path is not rooted in one of the standard directories (like ProgramFilesFolder), this component does not fit the criteria for having an automatically generated guid. (This error may also occur if a path contains a likely standard directory such as nesting a directory with name \"Common Files\" under ProgramFilesFolder.)", componentName, keyFilePath);
-        }
-
-        public static Message IllegalPropertyCustomActionAttributes(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalPropertyCustomActionAttributes, "The CustomAction sets a property but its Execute attribute is not 'immediate' (the default). Property-setting custom actions cannot be deferred.\"");
-        }
-
         public static Message IllegalRelativeLongFilename(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
         {
             return Message(sourceLineNumbers, Ids.IllegalRelativeLongFilename, "The {0}/@{1} attribute's value, '{2}', is not a valid relative long name because it contains illegal characters. Legal relative long names contain no more than 260 characters and must contain at least one non-period character. Any character except for the follow may be used: ? | > < : / * \".", elementName, attributeName, value);
         }
 
-        public static Message IllegalRootDirectory(SourceLineNumber sourceLineNumbers, string directoryId)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalRootDirectory, "The Directory with Id '{0}' is not a valid root directory. There may only be a single root directory per product or module and its Id attribute value must be 'TARGETDIR' and its Name attribute value must be 'SourceDir'.", directoryId);
-        }
-
-        public static Message IllegalSearchIdForParentDepth(SourceLineNumber sourceLineNumbers, string id, string parentId)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalSearchIdForParentDepth, "When the parent DirectorySearch/@Depth attribute is greater than 1 for the DirectorySearch '{1}', the FileSearch/@Id attribute must be absent for FileSearch '{0}' unless the parent DirectorySearch/@AssignToProperty attribute value is 'yes'. Remove the FileSearch/@Id attribute for '{0}' to resolve this issue.", id, parentId);
-        }
-
-        public static Message IllegalShortFilename(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalShortFilename, "The {0}/@{1} attribute's value, '{2}', is not a valid 8.3-compliant name. Legal names contain no more than 8 non-period characters followed by an optional period and extension of no more than 3 non-period characters. Any character except for the follow may be used: \\ ? | > < : / * \" + , ; = [ ] (space).", elementName, attributeName, value);
-        }
-
-        public static Message IllegalSuppressWarningId(string suppressedId)
-        {
-            return Message(null, Ids.IllegalSuppressWarningId, "Illegal value '{0}' for the -sw<N> command line option. Specify a particular warning number, like '-sw6' to suppress the warning with ID 6, or '-sw' alone to suppress all warnings.", suppressedId);
-        }
-
-        public static Message IllegalTargetDirDefaultDir(SourceLineNumber sourceLineNumbers, string defaultDir)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalTargetDirDefaultDir, "The 'TARGETDIR' directory has an illegal DefaultDir value of '{0}'. The DefaultDir value is created from the *Name attributes of the Directory element. The TARGETDIR directory is a special directory which must have its Name attribute set to 'SourceDir'.", defaultDir);
-        }
-
-        public static Message IllegalTerminalServerCustomActionAttributes(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalTerminalServerCustomActionAttributes, "The CustomAction/@TerminalServerAware attribute's value is 'yes' but the Execute attribute is not 'deferred,' 'rollback,' or 'commit.' Terminal-Server-aware custom actions must be deferred, rollback, or commit custom actions. For more information, see https://learn.microsoft.com/en-us/windows/win32/msi/terminalserver .\"");
-        }
-
-        public static Message IllegalValidationArguments()
-        {
-            return Message(null, Ids.IllegalValidationArguments, "You may only specify a single default type using -t or specify custom validation using -serr and -val.");
-        }
-
-        public static Message IllegalVersionValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalVersionValue, "The {0}/@{1} attribute's value, '{2}', is not a valid version. Specify a four-part version or semantic version, such as '#.#.#.#' or '#.#.#-label.#'.", elementName, attributeName, value);
-        }
-
-        public static Message IllegalWarningIdAsError(string warningId)
-        {
-            return Message(null, Ids.IllegalWarningIdAsError, "Illegal value '{0}' for the -wx<N> command line option. Specify a particular warning number, like '-wx6' to display the warning with ID 6 as an error, or '-wx' alone to suppress all warnings.", warningId);
-        }
-
-        public static Message IllegalBindVariablePrefix(SourceLineNumber sourceLineNumbers, string variableId)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalBindVariablePrefix, "The bind variable $(wix.{0}) uses an illegal prefix '$'. Please use the '!' prefix instead.", variableId);
-        }
-
-        public static Message IllegalYesNoAlwaysValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        public static Message TooManyElements(SourceLineNumber sourceLineNumbers, string elementName, string childElementName, int expectedInstances)
         {
-            return Message(sourceLineNumbers, Ids.IllegalYesNoAlwaysValue, "The {0}/@{1} attribute's value, '{2}', is not a legal yes/no/always value. The only legal values are 'always', 'no' or 'yes'.", elementName, attributeName, value);
+            return Message(sourceLineNumbers, Ids.TooManyElements, "The {0} element contains an unexpected child element '{1}'. The '{1}' element may only occur {2} time(s) under the {0} element.", elementName, childElementName, expectedInstances);
         }
 
-        public static Message IllegalYesNoDefaultValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        public static Message IdentifierTooLongError(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, int maxLength)
         {
-            return Message(sourceLineNumbers, Ids.IllegalYesNoDefaultValue, "The {0}/@{1} attribute's value, '{2}', is not a legal yes/no/default value. The only legal values are 'default', 'no' or 'yes'.", elementName, attributeName, value);
+            return Message(sourceLineNumbers, Ids.IdentifierTooLongError, "The {0}/@{1} attribute's value, '{2}', is too long. {0}/@{1} attribute's must be {3} characters long or less.", elementName, attributeName, value, maxLength);
         }
 
         public static Message IllegalYesNoValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
@@ -1071,41 +373,6 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.IllegalYesNoValue, "The {0}/@{1} attribute's value, '{2}', is not a legal yes/no value. The only legal values are 'no' and 'yes'.", elementName, attributeName, value);
         }
 
-        public static Message ImplicitComponentKeyPath(SourceLineNumber sourceLineNumbers, string componentId)
-        {
-            return Message(sourceLineNumbers, Ids.ImplicitComponentKeyPath, "The component '{0}' does not have an explicit key path specified. If the ordering of the elements under the Component element changes, the key path will also change. To prevent accidental changes, the key path should be set to 'yes' in one of the following locations: Component/@KeyPath, File/@KeyPath, ODBCDataSource/@KeyPath, or Registry/@KeyPath.", componentId);
-        }
-
-        public static Message InlineDirectorySyntaxRequiresPath(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, string identifier)
-        {
-            return Message(sourceLineNumbers, Ids.InlineDirectorySyntaxRequiresPath, "The {0}/@{1} attribute's value '{2}' only specifies a directory reference. The inline directory syntax requires that at least one directory be specified in addition to the value. For example, use '{3}:\\foo\\' to add a 'foo' directory.", elementName, attributeName, value, identifier);
-        }
-
-        public static Message InsecureBundleFilename(string filename)
-        {
-            return Message(null, Ids.InsecureBundleFilename, "The file name '{0}' creates an insecure bundle. Windows will load unnecessary compatibility shims into a bundle with that file name. These compatibility shims can be DLL hijacked allowing attackers to compromise your customers' computer. Choose a different bundle file name.", filename);
-        }
-
-        public static Message InsertInvalidSequenceActionOrder(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionNameBefore, string actionNameAfter, string actionNameNew)
-        {
-            return Message(sourceLineNumbers, Ids.InsertInvalidSequenceActionOrder, "Invalid order of actions {1} and {2} in sequence table {0}. Action {3} must occur after {1} and before {2}, but {2} is currently sequenced after {1}. Please fix the ordering or explicitly supply a location for the action {3}.", sequenceTableName, actionNameBefore, actionNameAfter, actionNameNew);
-        }
-
-        public static Message InsertSequenceNoSpace(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionNameBefore, string actionNameAfter, string actionNameNew)
-        {
-            return Message(sourceLineNumbers, Ids.InsertSequenceNoSpace, "Not enough space exists to sequence action {3} in table {0}. It must be sequenced after {1} and before {2}, but those two actions are currently sequenced next to each other. Please move one of those actions to allow {3} to be inserted between them.", sequenceTableName, actionNameBefore, actionNameAfter, actionNameNew);
-        }
-
-        public static Message InsufficientVersion(SourceLineNumber sourceLineNumbers, Version currentVersion, Version requiredVersion)
-        {
-            return Message(sourceLineNumbers, Ids.InsufficientVersion, "The current version of the toolset is {0}, but version {1} is required.", currentVersion, requiredVersion);
-        }
-
-        public static Message InsufficientVersion(SourceLineNumber sourceLineNumbers, Version currentVersion, Version requiredVersion, string extension)
-        {
-            return Message(sourceLineNumbers, Ids.InsufficientVersion, "The current version of the extension '{2}' is {0}, but version {1} is required.", currentVersion, requiredVersion, extension);
-        }
-
         public static Message IntegralValueOutOfRange(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, int value, int minimum, int maximum)
         {
             return Message(sourceLineNumbers, Ids.IntegralValueOutOfRange, "The {0}/@{1} attribute's value, '{2}', is not in the range of legal values. Legal values for this attribute are from {3} to {4}.", elementName, attributeName, value, minimum, maximum);
@@ -1126,201 +393,11 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.IntegralValueSentinelCollision, "The long integral value {0} collides with a sentinel value in the compiler code.", value);
         }
 
-        public static Message InvalidAddedFileRowWithoutSequence(SourceLineNumber sourceLineNumbers, string fileRowId)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidAddedFileRowWithoutSequence, "A row has been added to the File table with id '{1}' that does not have a sequence number assigned to it. Create your transform from a pair of msi's instead of xml outputs to get sequences assigned to your File table's rows.", fileRowId);
-        }
-
-        public static Message InvalidAssemblyFile(SourceLineNumber sourceLineNumbers, string assemblyFile, string moreInformation)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidAssemblyFile, "The assembly file '{0}' appears to be invalid. Please ensure this is a valid assembly file and that the user has the appropriate access rights to this file. More information: {1}", assemblyFile, moreInformation);
-        }
-
-        public static Message InvalidBundle(string bundleExecutable)
-        {
-            return Message(null, Ids.InvalidBundle, "Unable to read bundle executable '{0}'. This is not a valid WiX bundle.", bundleExecutable);
-        }
-
-        public static Message InvalidCabinetTemplate(SourceLineNumber sourceLineNumbers, string cabinetTemplate)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidCabinetTemplate, "CabinetTemplate attribute's value '{0}' must contain '{{0}}' and should contain no more than 8 characters followed by an optional extension of no more than 3 characters. Any character except for the follow 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).", cabinetTemplate);
-        }
-
-        public static Message InvalidCommandLineFileName(string fileName, string error)
-        {
-            return Message(null, Ids.InvalidCommandLineFileName, "Invalid file name specified on the command line: '{0}'. Error message: '{1}'", fileName, error);
-        }
-
-        public static Message InvalidBundleCondition(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string condition)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidBundleCondition, "The {0}/@{1} attribute's value '{2}' is not a valid bundle condition.", elementName, attributeName, condition);
-        }
-
-        public static Message InvalidDateTimeFormat(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidDateTimeFormat, "The {0}/@{1} attribute's value '{2}' is not a valid date/time value. A date/time value should follow the format YYYY-MM-DDTHH:mm:ss and be a valid date and time between 1980 and 2043, inclusive.", elementName, attributeName, value);
-        }
-
         public static Message InvalidDocumentElement(SourceLineNumber sourceLineNumbers, string elementName, string fileType, string expectedElementName)
         {
             return Message(sourceLineNumbers, Ids.InvalidDocumentElement, "The document element name '{0}' is invalid. A WiX {1} file must use '{2}' as the document element name.", elementName, fileType, expectedElementName);
         }
 
-        public static Message InvalidEmbeddedUIFileName(SourceLineNumber sourceLineNumbers, string codepage)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidEmbeddedUIFileName, "The EmbeddedUI/@Name attribute value, '{0}', does not contain an extension. Windows Installer will not load an embedded UI DLL without an extension. Include an extension or just omit the Name attribute so it defaults to the file name portion of the Source attribute value.", codepage);
-        }
-
-        public static Message CouldNotFindExtensionInPaths(string extensionPath, IEnumerable<string> checkedPaths)
-        {
-            return Message(null, Ids.InvalidExtension, "The extension '{0}' could not be found. Checked paths: {1}", extensionPath, String.Join(", ", checkedPaths));
-        }
-
-        public static Message InvalidExtension(string extension)
-        {
-            return Message(null, Ids.InvalidExtension, "The extension '{0}' could not be loaded.", extension);
-        }
-
-        public static Message InvalidExtension(string extension, string invalidReason)
-        {
-            return Message(null, Ids.InvalidExtension, "The extension '{0}' could not be loaded because of the following reason: {1}", extension, invalidReason);
-        }
-
-        public static Message InvalidExtension(string extension, string extensionType, string expectedType)
-        {
-            return Message(null, Ids.InvalidExtension, "The extension '{0}' is the wrong type: '{1}'. The expected type was '{2}'.", extension, extensionType, expectedType);
-        }
-
-        public static Message InvalidExtension(string extension, string extensionType, string expectedType1, string expectedType2)
-        {
-            return Message(null, Ids.InvalidExtension, "The extension '{0}' is the wrong type: '{1}'. The expected type was '{2}' or '{3}'.", extension, extensionType, expectedType1, expectedType2);
-        }
-
-        public static Message InvalidExtensionType(string extension, string attributeType)
-        {
-            return Message(null, Ids.InvalidExtensionType, "Either '{1}' was not defined in the assembly or the type defined in extension '{0}' could not be loaded.", extension, attributeType);
-        }
-
-        public static Message InvalidExtensionType(string extension, string className, string expectedType)
-        {
-            return Message(null, Ids.InvalidExtensionType, "The extension type '{1}' in extension '{0}' does not inherit from the expected class '{2}'.", extension, className, expectedType);
-        }
-
-        public static Message InvalidExtensionType(string extension, string className, string exceptionType, string exceptionMessage)
-        {
-            return Message(null, Ids.InvalidExtensionType, "The type '{1}' in extension '{0}' could not be loaded. Exception type '{2}' returned the following message: {3}", extension, className, exceptionType, exceptionMessage);
-        }
-
-        public static Message InvalidFileName(SourceLineNumber sourceLineNumbers, string fileName)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidFileName, "Invalid file name '{0}'.", fileName);
-        }
-
-        public static Message InvalidIdt(SourceLineNumber sourceLineNumbers, string idtFile)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidIdt, "There was an error importing the file '{0}'.", idtFile);
-        }
-
-        public static Message InvalidIdt(SourceLineNumber sourceLineNumbers, string idtFile, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidIdt, "There was an error importing table '{1}' from file '{0}'.", idtFile, tableName);
-        }
-
-        public static Message InvalidKeyColumn(string tableName, string columnName, string foreignTableName, int foreignColumnNumber)
-        {
-            return Message(null, Ids.InvalidKeyColumn, "The definition for the '{0}' table's '{1}' column is an invalid foreign key relationship to the {2} table's column number {3}. It is not a valid foreign key table column number because it is too small (less than 1) or greater than the count of columns in the foreign table's definition.", tableName, columnName, foreignTableName, foreignColumnNumber);
-        }
-
-        public static Message InvalidKeypathChange(SourceLineNumber sourceLineNumbers, string component, string transformPath)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidKeypathChange, "Component '{0}' has a changed keypath in the transform '{1}'. Patches cannot change the keypath of a component.", component, transformPath);
-        }
-
-        public static Message InvalidManifestContent(SourceLineNumber sourceLineNumbers, string fileName)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidManifestContent, "The manifest '{0}' does not have the required assembly/assemblyIdentity element.", fileName);
-        }
-
-        public static Message InvalidMergeLanguage(SourceLineNumber sourceLineNumbers, string mergeId, string mergeLanguage)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidMergeLanguage, "The Merge element '{0}' specified an invalid language '{1}'. Verify that localization tokens are being properly resolved to a numeric LCID.", mergeId, mergeLanguage);
-        }
-
-        public static Message InvalidFourPartVersion(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, 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 InvalidPlatformValue(SourceLineNumber sourceLineNumbers, string value)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidPlatformValue, "The Platform attribute has an invalid value {0}. Possible values are x86, x64, or arm64.", value);
-        }
-
-        public static Message InvalidPreprocessorFunction(SourceLineNumber sourceLineNumbers, string variable)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidPreprocessorFunction, "Ill-formed preprocessor function '${0}'. Functions must have a prefix (like 'fun.'), a name at least 1 character long, and matching opening and closing parentheses.", variable);
-        }
-
-        public static Message InvalidPreprocessorFunctionAutoVersion(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidPreprocessorFunctionAutoVersion, "Invalid AutoVersion template specified.");
-        }
-
-        public static Message InvalidPreprocessorPragma(SourceLineNumber sourceLineNumbers, string variable)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidPreprocessorPragma, "Malformed preprocessor pragma '{0}'. Pragmas must have a prefix, a name of at least 1 character long, and be followed by optional arguments.", variable);
-        }
-
-        public static Message InvalidPreprocessorVariable(SourceLineNumber sourceLineNumbers, string variable)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidPreprocessorVariable, "Ill-formed preprocessor variable '$({0})'. Variables must have a prefix (like 'var.', 'env.', or 'sys.') and a name at least 1 character long. If the literal string '$({0})' is desired, use '$$({0})'.", variable);
-        }
-
-        public static Message InvalidRemoveComponent(SourceLineNumber sourceLineNumbers, string component, string feature, string transformPath)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidRemoveComponent, "Removing component '{0}' from feature '{1}' is not supported. Either the component was removed or the guid changed in the transform '{2}'. Add the component back, undo the change to the component guid, or remove the entire feature.", component, feature, transformPath);
-        }
-
-        public static Message InvalidSequenceTable(string sequenceTableName)
-        {
-            return Message(null, Ids.InvalidSequenceTable, "Found an invalid sequence table '{0}'.", sequenceTableName);
-        }
-
-        public static Message InvalidStringForCodepage(SourceLineNumber sourceLineNumbers, string codepage)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidStringForCodepage, "A string was provided with characters that are not available in the specified database code page '{0}'. Either change these characters to ones that exist in the database's code page, or update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, or WixLocalization/@Codepage.", codepage);
-        }
-
-        public static Message InvalidStubExe(string filename)
-        {
-            return Message(null, Ids.InvalidStubExe, "Stub executable '{0}' is not a valid Win32 executable.", filename);
-        }
-
-        public static Message InvalidSubExpression(SourceLineNumber sourceLineNumbers, string subExpression, string expression)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidSubExpression, "Found invalid subexpression '{0}' in expression '{1}'.", subExpression, expression);
-        }
-
-        public static Message InvalidSummaryInfoCodePage(SourceLineNumber sourceLineNumbers, int codePage)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidSummaryInfoCodePage, "The code page '{0}' is invalid for summary information. You must specify an ANSI code page.", codePage);
-        }
-
-        public static Message InvalidValidatorMessageType(string type)
-        {
-            return Message(null, Ids.InvalidValidatorMessageType, "Unknown validation message type '{0}'.", type);
-        }
-
-        public static Message InvalidVariableDefinition(string variableDefinition)
-        {
-            return Message(null, Ids.InvalidVariableDefinition, "The variable definition '{0}' is not valid. Variable definitions should be in the form -dname=value where the value is optional.", variableDefinition);
-        }
-
-        public static Message InvalidWixTransform(string fileName)
-        {
-            return Message(null, Ids.InvalidWixTransform, "The file '{0}' is not a valid WiX Transform.", fileName);
-        }
-
         public static Message InvalidWixXmlNamespace(SourceLineNumber sourceLineNumbers, string wixElementName, string wixNamespace)
         {
             return Message(sourceLineNumbers, Ids.InvalidWixXmlNamespace, "The {0} element has no namespace. Please make the {0} element look like the following: <{0} xmlns=\"{1}\">.", wixElementName, wixNamespace);
@@ -1331,644 +408,175 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.InvalidWixXmlNamespace, "The {0} element has an incorrect namespace of '{1}'. Please make the {0} element look like the following: <{0} xmlns=\"{2}\">.", wixElementName, elementNamespace, wixNamespace);
         }
 
-        public static Message InvalidXml(SourceLineNumber sourceLineNumbers, string fileType, string detail)
-        {
-            return Message(sourceLineNumbers, Ids.InvalidXml, "Not a valid {0} file; detail: {1}", fileType, detail);
-        }
-
-        public static Message LocalizationVariableUnknown(SourceLineNumber sourceLineNumbers, string variableId)
-        {
-            return Message(sourceLineNumbers, Ids.LocalizationVariableUnknown, "The localization variable !(loc.{0}) is unknown. Please ensure the variable is defined.", variableId);
-        }
-
-        public static Message MaximumCabinetSizeForLargeFileSplittingTooLarge(SourceLineNumber sourceLineNumbers, int maximumCabinetSizeForLargeFileSplitting, int maxValueOfMaxCabSizeForLargeFileSplitting)
-        {
-            return Message(sourceLineNumbers, Ids.MaximumCabinetSizeForLargeFileSplittingTooLarge, "'{0}' is too large. Reduce the size of maximum cabinet size for large file splitting. The maximum permitted value is '{1}' MB.", maximumCabinetSizeForLargeFileSplitting, maxValueOfMaxCabSizeForLargeFileSplitting);
-        }
-
-        public static Message MaximumUncompressedMediaSizeTooLarge(SourceLineNumber sourceLineNumbers, int maximumUncompressedMediaSize)
-        {
-            return Message(sourceLineNumbers, Ids.MaximumUncompressedMediaSizeTooLarge, "'{0}' is too large. Reduce the size of maximum uncompressed media size.", maximumUncompressedMediaSize);
-        }
-
-        public static Message MediaEmbeddedCabinetNameTooLong(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, int length)
-        {
-            return Message(sourceLineNumbers, Ids.MediaEmbeddedCabinetNameTooLong, "The {0}/@{1} attribute's value, '{2}', is {3} characters long. The name is too long for an embedded cabinet. It cannot be more than than 62 characters long.", elementName, attributeName, value, length);
-        }
-
-        public static Message MediaTableCollision(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.MediaTableCollision, "Only one of Media and MediaTemplate tables should be authored.");
-        }
-
-        public static Message MergeExcludedModule(SourceLineNumber sourceLineNumbers, string mergeId, string otherMergeId)
-        {
-            return Message(sourceLineNumbers, Ids.MergeExcludedModule, "The module '{0}' cannot be merged because it excludes or is excluded by the merge module with signature '{1}'.", mergeId, otherMergeId);
-        }
-
-        public static Message MergeFeatureRequired(SourceLineNumber sourceLineNumbers, string tableName, string primaryKeys, string mergeModuleFile, string mergeId)
-        {
-            return Message(sourceLineNumbers, Ids.MergeFeatureRequired, "The {0} table contains a row with primary key(s) '{1}' which requires a feature to properly merge from the merge module '{2}'. Nest a MergeRef element with an Id attribute set to the value '{3}' under a Feature element to fix this error.", tableName, primaryKeys, mergeModuleFile, mergeId);
-        }
-
-        public static Message MergeLanguageFailed(SourceLineNumber sourceLineNumbers, short language, string mergeModuleFile)
-        {
-            return Message(sourceLineNumbers, Ids.MergeLanguageFailed, "The language '{0}' is supported but uses an invalid language transform in the merge module '{1}'.", language, mergeModuleFile);
-        }
-
-        public static Message MergeLanguageUnsupported(SourceLineNumber sourceLineNumbers, short language, string mergeModuleFile)
-        {
-            return Message(sourceLineNumbers, Ids.MergeLanguageUnsupported, "Could not locate language '{0}' (or a transform for this language) in the merge module '{1}'. This is likely due to an incorrectly authored Merge/@Language attribute.", language, mergeModuleFile);
-        }
-
-        public static Message MergeModuleExpectedFeature(SourceLineNumber sourceLineNumbers, string mergeId)
-        {
-            return Message(sourceLineNumbers, Ids.MergeModuleExpectedFeature, "The merge module '{0}' is not assigned to a feature. All merge modules must be assigned to at least one feature.", mergeId);
-        }
-
-        public static Message MergePlatformMismatch(SourceLineNumber sourceLineNumbers, string mergeModuleFile)
-        {
-            return Message(sourceLineNumbers, Ids.MergePlatformMismatch, "'{0}' is a 64-bit merge module but the product consuming it is 32-bit. 32-bit products can consume only 32-bit merge modules.", mergeModuleFile);
-        }
-
-        public static Message MissingBundleInformation(string friendlyName)
-        {
-            return Message(null, Ids.MissingBundleInformation, "The Bundle is missing {0} data, and cannot continue.", friendlyName);
-        }
-
-        public static Message MissingBundleSearch(SourceLineNumber sourceLineNumbers, string searchId)
-        {
-            return Message(sourceLineNumbers, Ids.MissingBundleSearch, "Bundle Search with id '{0}' has no corresponding implementation symbol.", searchId);
-        }
-
-        public static Message MissingDependencyVersion(string packageId)
-        {
-            return Message(null, Ids.MissingDependencyVersion, "The provider dependency version was not authored for the package with Id '{0}'. Please author the Provides/@Version attribute for this package.", packageId);
-        }
-
-        public static Message MissingEntrySection()
-        {
-            return Message(null, Ids.MissingEntrySection, "Could not find entry section in provided list of intermediates. Supported entry section types are: Package, Bundle, Patch, Module.");
-        }
-
-        public static Message MissingEntrySection(string sectionType)
-        {
-            return Message(null, Ids.MissingEntrySection, "Could not find entry section in provided list of intermediates. Expected section of type '{0}'.", sectionType);
-        }
-
-        public static Message MissingManifestForWin32Assembly(SourceLineNumber sourceLineNumbers, string file, string manifest)
-        {
-            return Message(sourceLineNumbers, Ids.MissingManifestForWin32Assembly, "File '{0}' is marked as a Win32 assembly but it refers to assembly manifest '{1}' that is not present in this product.", file, manifest);
-        }
-
-        public static Message MissingMedia(SourceLineNumber sourceLineNumbers, int diskId)
-        {
-            return Message(sourceLineNumbers, Ids.MissingMedia, "There is no media defined for disk id '{0}'. You must author either <Media Id='{0}' ...> or <MediaTemplate ...>.", diskId);
-        }
-
-        public static Message MissingOrInvalidModuleInstallerVersion(SourceLineNumber sourceLineNumbers, string moduleId, string mergeModuleFile, string productInstallerVersion)
-        {
-            return Message(sourceLineNumbers, Ids.MissingOrInvalidModuleInstallerVersion, "The merge module '{0}' from file '{1}' is either missing or has an invalid installer version. The value read from the installer version in module's summary information was '{2}'. This should be a numeric value representing a valid installer version such as 200 or 301.", moduleId, mergeModuleFile, productInstallerVersion);
-        }
-
-        public static Message MissingPackagePayload(SourceLineNumber sourceLineNumbers, string packageId, string packageType)
-        {
-            return Message(sourceLineNumbers, Ids.MissingPackagePayload, "There is no payload defined for package '{0}'. This is specified on the {1}Package element or a child {1}PackagePayload element.", packageId, packageType);
-        }
-
-        public static Message MissingTableDefinition(string tableName)
-        {
-            return Message(null, Ids.MissingTableDefinition, "Cannot find the table definitions for the '{0}' table. This is likely due to a typing error or missing extension. Please ensure all the necessary extensions are supplied on the command line with the -ext parameter.", tableName);
-        }
-
-        public static Message MissingTypeLibFile(SourceLineNumber sourceLineNumbers, string elementName, string fileElementName)
-        {
-            return Message(sourceLineNumbers, Ids.MissingTypeLibFile, "The {0} element is non-advertised and therefore requires a parent {1} element.", elementName, fileElementName);
-        }
-
-        public static Message MissingValidatorExtension()
-        {
-            return Message(null, Ids.MissingValidatorExtension, "The validator requires at least one extension. Add \"ValidatorExtension, Wix\" for the default implementation.");
-        }
-
-        public static Message MsiTransactionInvalidPackage(SourceLineNumber sourceLineNumbers, string packageId, string packageType)
-        {
-            return Message(sourceLineNumbers, Ids.MsiTransactionInvalidPackage, "Invalid package '{0}' in MSI transaction. It is type '{1}' but must be Msi or Msp.", packageId, packageType);
-        }
-
-        public static Message MsiTransactionInvalidPackage2(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.MsiTransactionInvalidPackage2, "Location of rollback boundary related to previous error.");
-        }
-
-        public static Message MsiTransactionX86BeforeX64Package(SourceLineNumber sourceLineNumbers, string x64PackageId, string x86PackageId)
-        {
-            return Message(sourceLineNumbers, Ids.MsiTransactionX86BeforeX64Package, "Package '{0}' is x64 but Package '{1}' is x86. MSI transactions must install all x64 packages before any x86 package.", x64PackageId, x86PackageId);
-        }
-
-        public static Message MsiTransactionX86BeforeX64Package2(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.MsiTransactionX86BeforeX64Package2, "Location of x86 package related to previous error.");
-        }
-
-        public static Message MultipleEntrySections(SourceLineNumber sourceLineNumbers, string sectionName1, string sectionName2)
-        {
-            return Message(sourceLineNumbers, Ids.MultipleEntrySections, "Multiple entry sections '{0}' and '{1}' found. Only one entry section may be present in a single target.", sectionName1, sectionName2);
-        }
-
-        public static Message MultipleEntrySections2(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.MultipleEntrySections2, "Location of entry section related to previous error.");
-        }
-
-        public static Message MultipleFilesMatchedWithOutputSpecification(string sourceSpecification, string sourceList)
-        {
-            return Message(null, Ids.MultipleFilesMatchedWithOutputSpecification, "A per-source file output specification has been provided ('{0}'), but multiple source files match the source specification ({1}). Specifying a unique output requires that only a single source file match.", sourceSpecification, sourceList);
-        }
-
-        public static Message MultipleIdentifiersFound(SourceLineNumber sourceLineNumbers, string elementName, string identifier, string mismatchIdentifier)
-        {
-            return Message(sourceLineNumbers, Ids.MultipleIdentifiersFound, "Under a '{0}' element, multiple identifiers were found: '{1}' and '{2}'. All search elements under this element must have the same id.", elementName, identifier, mismatchIdentifier);
-        }
-
-        public static Message MultiplePackagePayloads(SourceLineNumber sourceLineNumbers, string packageId, string packagePayloadId1, string packagePayloadId2)
-        {
-            return Message(sourceLineNumbers, Ids.MultiplePackagePayloads, "The package '{0}' has multiple PackagePayloads: '{1}' and '{2}'. This normally happens when the payload is defined on the package element and a child PackagePayload element.", packageId, packagePayloadId1, packagePayloadId2);
-        }
-
-        public static Message MultiplePackagePayloads2(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.MultiplePackagePayloads2, "The location of the package payload related to previous error.");
-        }
-
-        public static Message MultiplePackagePayloads3(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.MultiplePackagePayloads3, "The location of the package related to previous error.");
-        }
-
-        public static Message MultiplePrimaryReferences(SourceLineNumber sourceLineNumbers, string crefChildType, string crefChildId, string crefParentType, string crefParentId, string conflictParentType, string conflictParentId)
-        {
-            return Message(sourceLineNumbers, Ids.MultiplePrimaryReferences, "Multiple primary references were found for {0} '{1}' in {2} '{3}' and {4} '{5}'.", crefChildType, crefChildId, crefParentType, crefParentId, conflictParentType, conflictParentId);
-        }
-
-        public static Message MustSpecifyOutputWithMoreThanOneInput()
-        {
-            return Message(null, Ids.MustSpecifyOutputWithMoreThanOneInput, "You must specify an output file using the \"-o\" or \"-out\" switch when you provide more than one input file.");
-        }
-
-        public static Message NeedSequenceBeforeOrAfter(SourceLineNumber sourceLineNumbers, string elementName)
-        {
-            return Message(sourceLineNumbers, Ids.NeedSequenceBeforeOrAfter, "A {0} element must have a Before attribute, After attribute, or a Sequence attribute.", elementName);
-        }
-
-        public static Message NewRowAddedInTable(SourceLineNumber sourceLineNumbers, string productCode, string tableName, string rowId)
-        {
-            return Message(sourceLineNumbers, Ids.NewRowAddedInTable, "Product '{0}': Table '{1}' has a new row '{2}' added. This makes the patch not uninstallable.", productCode, tableName, rowId);
-        }
-
-        public static Message NoDataForColumn(SourceLineNumber sourceLineNumbers, string columnName, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.NoDataForColumn, "There is no data for column '{0}' in a contained row of custom table '{1}'. A non-null value must be supplied for this column.", columnName, tableName);
-        }
-
-        public static Message NoDifferencesInTransform(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.NoDifferencesInTransform, "The transform being built did not contain any differences so it could not be created.");
-        }
-
-        public static Message NoFirstControlSpecified(SourceLineNumber sourceLineNumbers, string dialogName)
-        {
-            return Message(sourceLineNumbers, Ids.NoFirstControlSpecified, "The '{0}' dialog element does not have a valid tabbable control. You must either have a tabbable control that is not marked TabSkip='yes', or you must mark a control TabSkip='no'. If you have a page with no tabbable controls (a progress page, for example), you might want to set the first Text control to be TabSkip='no'.", dialogName);
-        }
-
-        public static Message NonterminatedPreprocessorInstruction(SourceLineNumber sourceLineNumbers, string beginInstruction, string endInstruction)
-        {
-            return Message(sourceLineNumbers, Ids.NonterminatedPreprocessorInstruction, "Found a <?{0}?> processing instruction without a matching <?{1}?> after it.", beginInstruction, endInstruction);
-        }
-
-        public static Message NoUniqueActionSequenceNumber(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName1, string actionName2)
-        {
-            return Message(sourceLineNumbers, Ids.NoUniqueActionSequenceNumber, "The {0} table contains an action '{1}' which cannot have a unique sequence number because it is scheduled before or after action '{2}'. There is not enough room before or after this action to assign a unique sequence number. Please schedule one of the actions differently so that it will be in a position with more sequence numbers available. Please note that sequence numbers must be an integer in the range 1 - 32767 (inclusive).", sequenceTableName, actionName1, actionName2);
-        }
-
-        public static Message NoUniqueActionSequenceNumber2(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.NoUniqueActionSequenceNumber2, "The location of the sequenced action related to previous error.");
-        }
-
-        public static Message OrderingReferenceLoopDetected(SourceLineNumber sourceLineNumbers, string loopList)
-        {
-            return Message(sourceLineNumbers, Ids.OrderingReferenceLoopDetected, "A circular reference of ordering dependencies was detected. The infinite loop includes: {0}. Ordering dependency references must form a directed acyclic graph.", loopList);
-        }
-
-        public static Message OrphanedComponent(SourceLineNumber sourceLineNumbers, string componentName)
-        {
-            return Message(sourceLineNumbers, Ids.OrphanedComponent, "Found orphaned Component '{0}'. If this is a Package, every Component must have at least one parent Feature. To include a Component in a Module, you must include it directly as a Component element of the Module element or indirectly via ComponentRef, ComponentGroup, or ComponentGroupRef elements.", componentName);
-        }
-
-        public static Message OutputCodepageMismatch(SourceLineNumber sourceLineNumbers, int beforeCodepage, int afterCodepage)
-        {
-            return Message(sourceLineNumbers, Ids.OutputCodepageMismatch, "The code pages of the outputs do not match. One output's code page is '{0}' while the other is '{1}'.", beforeCodepage, afterCodepage);
-        }
-
-        public static Message OutputCodepageMismatch2(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.OutputCodepageMismatch2, "The location of the mismatched code page related to the previous warning.");
-        }
-
-        public static Message OutputTargetNotSpecified()
-        {
-            return Message(null, Ids.OutputTargetNotSpecified, "The '-out' or '-o' parameter must specify a file path.");
-        }
-
-        public static Message OutputTypeMismatch(SourceLineNumber sourceLineNumbers, string beforeOutputType, string afterOutputType)
-        {
-            return Message(sourceLineNumbers, Ids.OutputTypeMismatch, "The types of the outputs do not match. One output's type is '{0}' while the other is '{1}'.", beforeOutputType, afterOutputType);
-        }
-
-        public static Message OverridableActionCollision(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
-        {
-            return Message(sourceLineNumbers, Ids.OverridableActionCollision, "The {0} table contains an action '{1}' that is declared overridable in two different locations. Please remove one of the actions or the Overridable='yes' attribute from one of the actions.", sequenceTableName, actionName);
-        }
-
-        public static Message OverridableActionCollision2(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.OverridableActionCollision2, "The location of the action related to previous error.");
-        }
-
-        public static Message PackagePayloadUnsupported(SourceLineNumber sourceLineNumbers, string packageType)
-        {
-            return Message(sourceLineNumbers, Ids.PackagePayloadUnsupported, "The {0}PackagePayload element can only be used for {0}Packages.", packageType);
-        }
-
-        public static Message PackagePayloadUnsupported2(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.PackagePayloadUnsupported2, "The location of the package related to previous error.");
-        }
-
-        public static Message ParentElementAttributeRequired(SourceLineNumber sourceLineNumbers, string parentElement, string parentAttribute, string childElement)
-        {
-            return Message(sourceLineNumbers, Ids.ParentElementAttributeRequired, "The parent {0} element is missing the {1} attribute that is required for the {2} child element.", parentElement, parentAttribute, childElement);
-        }
-
-        public static Message PatchNotRemovable()
-        {
-            return Message(null, Ids.PatchNotRemovable, "This patch is not uninstallable. The 'Patch' element's attribute 'AllowRemoval' should be set to 'no'.");
-        }
-
-        public static Message PatchWithoutTransforms()
-        {
-            return Message(null, Ids.PatchWithoutTransforms, "No transforms were provided to attach to the patch.");
-        }
-
-        public static Message PatchWithoutValidTransforms()
-        {
-            return Message(null, Ids.PatchWithoutValidTransforms, "No valid transforms were provided to attach to the patch. Check to make sure the transforms you passed on the command line have a matching baseline authored in the patch. Also, make sure there are differences between your target and upgrade.");
-        }
-
-        public static Message PathCannotContainQuote(string fileName)
-        {
-            return Message(null, Ids.PathCannotContainQuote, "Path '{0}' contains a literal quote character. Quotes are often accidentally introduced when trying to refer to a directory path with spaces in it, such as \"C:\\Out Directory\\\" -- the backslash before the quote acts an escape character. The correct representation for that path is: \"C:\\Out Directory\\\\\".", fileName);
-        }
-
-        public static Message PathTooLong(SourceLineNumber sourceLineNumbers, string fileName)
-        {
-            return Message(sourceLineNumbers, Ids.PathTooLong, "'{0}' is too long, the fully qualified file name must be less than 260 characters, and the directory name must be less than 248 characters.", fileName);
-        }
-
         public static Message PayloadMustBeRelativeToCache(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue)
         {
             return Message(sourceLineNumbers, Ids.PayloadMustBeRelativeToCache, "The {0}/@{1} attribute's value, '{2}', is not a relative path.", elementName, attributeName, attributeValue);
         }
 
-        public static Message PerUserButAllUsersEquals1(SourceLineNumber sourceLineNumbers, string path)
-        {
-            return Message(sourceLineNumbers, Ids.PerUserButAllUsersEquals1, "The MSI '{0}' is explicitly marked to not elevate so it must be a per-user package but the ALLUSERS Property is set to '1' creating a per-machine package. Remove the Property with Id='ALLUSERS' and use Package/@Scope attribute to be explicit instead.", path);
-        }
-
-        public static Message PreprocessorError(SourceLineNumber sourceLineNumbers, string message)
-        {
-            return Message(sourceLineNumbers, Ids.PreprocessorError, "{0}", message);
-        }
-
-        public static Message PreprocessorExtensionEvaluateFunctionFailed(SourceLineNumber sourceLineNumbers, string prefix, string function, string args, string message)
-        {
-            return Message(sourceLineNumbers, Ids.PreprocessorExtensionEvaluateFunctionFailed, "In the preprocessor extension that handles prefix '{0}' while trying to call function '{1}({2})' and exception has occurred : {3}", prefix, function, args, message);
-        }
-
-        public static Message PreprocessorExtensionForParameterMissing(SourceLineNumber sourceLineNumbers, string parameterName, string parameterPrefix)
-        {
-            return Message(sourceLineNumbers, Ids.PreprocessorExtensionForParameterMissing, "Could not find the preprocessor extension for parameter '{0}'. A preprocessor extension is expected because the parameter prefix, '{1}', is not one of the standard types: 'env', 'res', 'sys', or 'var'.", parameterName, parameterPrefix);
-        }
-
-        public static Message PreprocessorExtensionGetVariableValueFailed(SourceLineNumber sourceLineNumbers, string prefix, string variable, string message)
-        {
-            return Message(sourceLineNumbers, Ids.PreprocessorExtensionGetVariableValueFailed, "In the preprocessor extension that handles prefix '{0}' while trying to get the value for variable '{1}' and exception has occured : {2}", prefix, variable, message);
-        }
-
-        public static Message PreprocessorExtensionPragmaFailed(SourceLineNumber sourceLineNumbers, string pragma, string message)
-        {
-            return Message(sourceLineNumbers, Ids.PreprocessorExtensionPragmaFailed, "Exception thrown while processing pragma '{0}'. The exception's message is: {1}", pragma, message);
-        }
-
-        public static Message PreprocessorIllegalForeachVariable(SourceLineNumber sourceLineNumbers, string variableName)
-        {
-            return Message(sourceLineNumbers, Ids.PreprocessorIllegalForeachVariable, "The variable named '{0}' is not allowed in a foreach expression.", variableName);
-        }
-
-        public static Message PreprocessorMissingParameterPrefix(SourceLineNumber sourceLineNumbers, string parameterName)
-        {
-            return Message(sourceLineNumbers, Ids.PreprocessorMissingParameterPrefix, "Could not find the prefix in parameter name: '{0}'.", parameterName);
-        }
-
-        public static Message ProductCodeInvalidForTransform(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.ProductCodeInvalidForTransform, "The value '*' is not valid for the ProductCode when used in a transform or in a patch. Copy the ProductCode from your target product MSI into the Package/@ProductCode attribute value for your product authoring.");
-        }
-
-        public static Message ProgIdNestedTooDeep(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.ProgIdNestedTooDeep, "ProgId elements may not be nested more than 1 level deep.");
-        }
-
-        public static Message RadioButtonBitmapAndIconDisallowed(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.RadioButtonBitmapAndIconDisallowed, "RadioButtonGroup elements that contain RadioButton elements with Bitmap or Icon attributes set to \"yes\" can only be specified under a Control element. Move your RadioButtonGroup element as a child of the appropriate Control element.");
-        }
-
-        public static Message RadioButtonTypeInconsistent(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.RadioButtonTypeInconsistent, "All RadioButton elements in a RadioButtonGroup must be consistent with their use of the Bitmap, Icon, and Text attributes. Ensure all of the RadioButton elements in this group have the same attribute specified.");
-        }
-
-        public static Message ReadOnlyOutputFile(string filePath)
-        {
-            return Message(null, Ids.ReadOnlyOutputFile, "Unable to output to file '{0}' because it is marked as read-only.", filePath);
-        }
-
         public static Message RealTableMissingPrimaryKeyColumn(SourceLineNumber sourceLineNumbers, string tableName)
         {
             return Message(sourceLineNumbers, Ids.RealTableMissingPrimaryKeyColumn, "The table '{0}' does not contain any primary key columns. At least one column must be marked as the primary key to ensure this table can be patched.", tableName);
         }
 
-        public static Message RecursiveAction(string action, string tableName)
-        {
-            return Message(null, Ids.RecursiveAction, "The action '{0}' is recursively placed in the '{1}' table.", action, tableName);
-        }
-
-        public static Message ReferenceLoopDetected(SourceLineNumber sourceLineNumbers, string loopList)
-        {
-            return Message(sourceLineNumbers, Ids.ReferenceLoopDetected, "A circular reference of groups was detected. The infinite loop includes: {0}. Group references must form a directed acyclic graph.", loopList);
-        }
-
-        public static Message RegistryMultipleValuesWithoutMultiString(SourceLineNumber sourceLineNumbers, string registryElementName, string valueAttributeName, string registryValueElementName, string typeAttributeName)
-        {
-            return Message(sourceLineNumbers, Ids.RegistryMultipleValuesWithoutMultiString, "The {0}/@{1} attribute and a {0}/{2} element cannot both be specified. Only one may be specified if the {3} attribute's value is not 'multiString'.", registryElementName, valueAttributeName, registryValueElementName, typeAttributeName);
-        }
-
-        public static Message RegistryNameValueIncorrect(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.RegistryNameValueIncorrect, "The {0}/@{1} attribute's value, '{2}', is incorrect. It should not contain values of '+', '-', or '*' when the {0}/@Value attribute is empty. Instead, use the proper element and attributes: for Name='+' use RegistryKey/@Action='createKey', for Name='-' use RemoveRegistryKey/@Action='removeOnUninstall', for Name='*' use RegistryKey/@Action='createAndRemoveOnUninstall'.", elementName, attributeName, value);
-        }
-
-        public static Message RegistryRootInvalid(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.RegistryRootInvalid, "Registry/@Root attribute is invalid on a nested Registry element. Either remove the Root attribute or move the Registry element so it is not nested under another Registry element.");
-        }
-
-        public static Message RegistrySubElementCannotBeRemoved(SourceLineNumber sourceLineNumbers, string registryElementName, string registryValueElementName, string actionAttributeName, string removeValue, string removeKeyOnInstallValue)
-        {
-            return Message(sourceLineNumbers, Ids.RegistrySubElementCannotBeRemoved, "The {0}/{1} element cannot be specified if the {2} attribute's value is '{3}' or '{4}'.", registryElementName, registryValueElementName, actionAttributeName, removeValue, removeKeyOnInstallValue);
-        }
-
-        public static Message RelativePathForRegistryElement(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.RelativePathForRegistryElement, "Cannot convert RelativePath into Registry elements.");
-        }
-
-        public static Message ReservedBurnNamespaceViolation(SourceLineNumber sourceLineNumbers, string element, string attribute, string prefix)
-        {
-            return Message(sourceLineNumbers, Ids.ReservedNamespaceViolation, "The {0}/@{1} attribute's value begins with the reserved prefix '{2}'. Some prefixes are reserved by the WiX toolset for well-known values. Change your attribute's value to not begin with the same prefix.", element, attribute, prefix);
-        }
-
-        public static Message ReservedNamespaceViolation(SourceLineNumber sourceLineNumbers, string element, string attribute, string prefix)
-        {
-            return Message(sourceLineNumbers, Ids.ReservedNamespaceViolation, "The {0}/@{1} attribute's value begins with the reserved prefix '{2}'. Some prefixes are reserved by the Windows Installer and WiX Toolset for well-known values. Change your attribute's value to not begin with the same prefix.", element, attribute, prefix);
-        }
-
-        public static Message RootFeatureCannotFollowParent(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.RootFeatureCannotFollowParent, "The Feature element specifies a root feature with an illegal InstallDefault value of 'followParent'. Root features cannot follow their parent feature's install state because they don't have a parent feature. Please remove or change the value of the InstallDefault attribute.");
-        }
-
-        public static Message SameFileIdDifferentSource(SourceLineNumber sourceLineNumbers, string fileId, string sourcePath1, string sourcePath2)
-        {
-            return Message(sourceLineNumbers, Ids.SameFileIdDifferentSource, "Two different source paths '{1}' and '{2}' were detected for the same file identifier '{0}'. You must either author these under Media elements with different Id attribute values or in different patches.", fileId, sourcePath1, sourcePath2);
-        }
-
-        public static Message SamePatchBaselineId(SourceLineNumber sourceLineNumbers, string id)
-        {
-            return Message(sourceLineNumbers, Ids.SamePatchBaselineId, "The PatchBaseline/@Id attribute value '{0}' is a child of multiple Media elements. This prevents transforms from being resolved to distinct media. Change the PatchBaseline/@Id attribute values to be unique.", id);
-        }
-
-        public static Message SchemaValidationFailed(SourceLineNumber sourceLineNumbers, string validationError, int lineNumber, int linePosition)
-        {
-            return Message(sourceLineNumbers, Ids.SchemaValidationFailed, "Schema validation failed with the following error at line {1}, column {2}: {0}", validationError, lineNumber, linePosition);
-        }
-
-        public static Message SearchElementRequired(SourceLineNumber sourceLineNumbers, string elementName)
-        {
-            return Message(sourceLineNumbers, Ids.SearchElementRequired, "A '{0}' element must have a search element as a child.", elementName);
-        }
-
-        public static Message SearchElementRequiredWithAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue)
-        {
-            return Message(sourceLineNumbers, Ids.SearchElementRequiredWithAttribute, "A {0} element must have a search element as a child when the {0}/@{1} attribute has the value '{2}'.", elementName, attributeName, attributeValue);
-        }
-
-        public static Message SearchPropertyNotUppercase(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
-        {
-            return Message(sourceLineNumbers, Ids.SearchPropertyNotUppercase, "The {0}/@{1} attribute's value, '{2}', cannot contain lowercase characters. Since this is a search property, it must also be a public property. This means the Property/@Id value must be completely uppercase.", elementName, attributeName, value);
-        }
-
-        public static Message SecurePropertyNotUppercase(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string propertyId)
-        {
-            return Message(sourceLineNumbers, Ids.SecurePropertyNotUppercase, "The {0}/@{1} attribute's value, '{2}', cannot contain lowercase characters. Since this is a secure property, it must also be a public property. This means the Property/@Id value must be completely uppercase.", elementName, attributeName, propertyId);
-        }
-
-        public static Message SignedEmbeddedCabinet(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.SignedEmbeddedCabinet, "The DigitalSignature element cannot be nested under a Media element which specifies EmbedCab='yes'. This is because Windows Installer can only verify the digital signatures of external cabinets. Please either remove the DigitalSignature element or change the value of the Media/@EmbedCab attribute to 'no'.");
-        }
-
-        public static Message SingleExtensionSupported()
-        {
-            return Message(null, Ids.SingleExtensionSupported, "Multiple extensions were specified on the command line, only a single extension is supported.");
-        }
-
-        public static Message SpecifiedBinderNotFound(string binderClass)
-        {
-            return Message(null, Ids.SpecifiedBinderNotFound, "The specified binder class '{0}' was not found in any extensions.", binderClass);
-        }
-
-        public static Message SplitCabinetCopyRegistrationFailed(string newCabName, string firstCabName)
+        public static Message StreamNameTooLong(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, int length, int maximumLength)
         {
-            return Message(null, Ids.SplitCabinetCopyRegistrationFailed, "Failed to register the copy command for cabinet '{0}' formed by splitting cabinet '{1}'.", newCabName, firstCabName);
+            return Message(sourceLineNumbers, Ids.StreamNameTooLong, "The {0}/@{1} attribute's value, '{2}', is {3} characters long. This is too long because it will be used to create a stream name. It cannot be more than than {4} characters long.", elementName, attributeName, value, length, maximumLength);
         }
 
-        public static Message SplitCabinetNameCollision(string newCabName, string firstCabName)
+        public static Message StreamNameTooLong(SourceLineNumber sourceLineNumbers, string tableName, string streamName, int streamLength)
         {
-            return Message(null, Ids.SplitCabinetNameCollision, "The cabinet name '{0}' collides with the new cabinet formed by splitting cabinet '{1}', consider renaming cabinet '{0}'.", newCabName, firstCabName);
+            return Message(sourceLineNumbers, Ids.StreamNameTooLong, "The binary value in table '{0}' will be stored with a stream name, '{1}', that is {2} characters long. This is too long because the maximum allowed length for a stream name is 62 characters long. Since the stream name is created by concatenating the table name and values of the primary key for a row (delimited by periods), this error can be resolved by shortening a value that is part of the primary key.", tableName, streamName, streamLength);
         }
 
-        public static Message StandardActionRelativelyScheduledInModule(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
+        public static Message UnableToConvertFieldToNumber(string value)
         {
-            return Message(sourceLineNumbers, Ids.StandardActionRelativelyScheduledInModule, "The {0} table contains a standard action '{1}' that does not have a sequence number specified. The Sequence attribute is required for standard actions in a merge module. Please remove the action or use the Sequence attribute.", sequenceTableName, actionName);
+            return Message(null, Ids.UnableToConvertFieldToNumber, "Unable to convert intermediate symbol field value '{0}' to a number. This means the intermediate is corrupt or of an unsupported version.", value);
         }
 
-        public static Message StreamNameTooLong(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, int length, int maximumLength)
+        public static Message UnexpectedAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
         {
-            return Message(sourceLineNumbers, Ids.StreamNameTooLong, "The {0}/@{1} attribute's value, '{2}', is {3} characters long. This is too long because it will be used to create a stream name. It cannot be more than than {4} characters long.", elementName, attributeName, value, length, maximumLength);
+            return Message(sourceLineNumbers, Ids.UnexpectedAttribute, "The {0} element contains an unexpected attribute '{1}'.", elementName, attributeName);
         }
 
-        public static Message StreamNameTooLong(SourceLineNumber sourceLineNumbers, string tableName, string streamName, int streamLength)
+        public static Message UnexpectedElement(SourceLineNumber sourceLineNumbers, string elementName, string childElementName)
         {
-            return Message(sourceLineNumbers, Ids.StreamNameTooLong, "The binary value in table '{0}' will be stored with a stream name, '{1}', that is {2} characters long. This is too long because the maximum allowed length for a stream name is 62 characters long. Since the stream name is created by concatenating the table name and values of the primary key for a row (delimited by periods), this error can be resolved by shortening a value that is part of the primary key.", tableName, streamName, streamLength);
+            return Message(sourceLineNumbers, Ids.UnexpectedElement, "The {0} element contains an unexpected child element '{1}'.", elementName, childElementName);
         }
 
-        public static Message StubMissingWixburnSection(string filename)
+        public static Message UnexpectedException(Exception exception)
         {
-            return Message(null, Ids.StubMissingWixburnSection, "Stub executable '{0}' does not contain a .wixburn data section.", filename);
+            return Message(null, Ids.UnexpectedException, exception.ToString());
         }
 
-        public static Message StubWixburnSectionTooSmall(string filename)
+        public static Message UnexpectedException(string message, string type, string stackTrace)
         {
-            return Message(null, Ids.StubWixburnSectionTooSmall, "Stub executable '{0}' .wixburn data section is too small to store the Burn container header.", filename);
+            return Message(null, Ids.UnexpectedException, "{0}\r\n\r\nException Type: {1}\r\n\r\nStack Trace:\r\n{2}", message, type, stackTrace);
         }
 
-        public static Message SuppressNonoverridableAction(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
+        public static Message UnexpectedFileFormat(string path, string expectedFormat, string actualFormat)
         {
-            return Message(sourceLineNumbers, Ids.SuppressNonoverridableAction, "The {0} table contains an action '{1}' that cannot be suppressed because it is not declared overridable in the base definition. Please stop suppressing the action or make it overridable in its base declaration.", sequenceTableName, actionName);
+            return Message(null, Ids.UnexpectedFileFormat, "Unexpected file format loaded from path: {0}. The file was expected to be a {1} but was actually: {2}. Ensure the correct path was provided.", path, expectedFormat.ToLowerInvariant(), actualFormat.ToLowerInvariant());
         }
 
-        public static Message SuppressNonoverridableAction2(SourceLineNumber sourceLineNumbers)
+        public static Message UnsupportedPlatformForElement(SourceLineNumber sourceLineNumbers, string platform, string elementName)
         {
-            return Message(sourceLineNumbers, Ids.SuppressNonoverridableAction2, "The location of the non-overridable definition of the action related to previous error.");
+            return Message(sourceLineNumbers, Ids.UnsupportedPlatformForElement, "The element {1} does not support platform '{0}'. Consider removing the element or using the preprocessor to conditionally include the element based on the platform.", platform, elementName);
         }
 
-        public static Message TabbableControlNotAllowedInBillboard(SourceLineNumber sourceLineNumbers, string elementName, string controlType)
+        public static Message VersionMismatch(SourceLineNumber sourceLineNumbers, string fileType, string version, string expectedVersion)
         {
-            return Message(sourceLineNumbers, Ids.TabbableControlNotAllowedInBillboard, "A {0} element was specified with Type='{1}' and TabSkip='no'. Tabbable controls are not allowed in Billboards.", elementName, controlType);
+            return Message(sourceLineNumbers, Ids.VersionMismatch, "The {0} file format version {1} is not compatible with the expected {0} file format version {2}.", fileType, version, expectedVersion);
         }
 
-        public static Message TableDecompilationUnimplemented(string tableName)
+        public static Message UnknownSymbolType(string symbolName)
         {
-            return Message(null, Ids.TableDecompilationUnimplemented, "Decompilation of the {0} table has not been implemented by its extension.", tableName);
+            return Message(null, Ids.UnknownSymbolType, "Could not deserialize symbol of type type '{0}' because it is not a standard symbol type or one provided by a loaded extension.", symbolName);
         }
 
-        public static Message TableNameTooLong(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        public static Message IllegalAttributeWhenNested(SourceLineNumber sourceLineNumbers, string attributeName)
         {
-            return Message(sourceLineNumbers, Ids.TableNameTooLong, "The {0}/@{1} attribute's value, '{2}', is too long for a table name. It cannot be more than than 31 characters long.", elementName, attributeName, value);
+            return Message(sourceLineNumbers, Ids.IllegalAttributeWhenNested, "The File element contains an attribute '{0}' that cannot be used in a File element that is a child of a Component element.", attributeName);
         }
 
-        public static Message TooDeeplyIncluded(SourceLineNumber sourceLineNumbers, int depth)
+        public static Message CommandLineCommandRequired()
         {
-            return Message(sourceLineNumbers, Ids.TooDeeplyIncluded, "Include files cannot be nested more deeply than {0} times. Make sure included files don't accidentally include themselves.", depth);
+            return Message(null, Ids.CommandLineCommandRequired, "A command is required. Add -h for list of available subcommands.");
         }
 
-        public static Message TooManyChildren(SourceLineNumber sourceLineNumbers, string elementName, string childElementName)
+        public static Message CommandLineCommandRequired(string command)
         {
-            return Message(sourceLineNumbers, Ids.TooManyChildren, "The {0} element contains multiple {1} child elements. There can only be one {1} child element per {0} element.", elementName, childElementName);
+            return Message(null, Ids.CommandLineCommandRequired, "A subcommand is required for the \"{0}\" command. Add -h for list of available commands.", command);
         }
 
-        public static Message TooManyColumnsInRealTable(string tableName, int columnCount, int supportedColumnCount)
+        public static Message CubeFileNotFound(string cubeFile)
         {
-            return Message(null, Ids.TooManyColumnsInRealTable, "The table '{0}' contains {1} columns which is not supported by Windows Installer. Windows Installer supports a maximum of {2} columns.", tableName, columnCount, supportedColumnCount);
+            return Message(null, Ids.CubeFileNotFound, "The cube file '{0}' cannot be found. This file is required for MSI validation.", cubeFile);
         }
 
-        public static Message TooManyElements(SourceLineNumber sourceLineNumbers, string elementName, string childElementName, int expectedInstances)
+        public static Message DuplicatePrimaryKey(SourceLineNumber sourceLineNumbers, string primaryKey, string tableName)
         {
-            return Message(sourceLineNumbers, Ids.TooManyElements, "The {0} element contains an unexpected child element '{1}'. The '{1}' element may only occur {2} time(s) under the {0} element.", elementName, childElementName, expectedInstances);
+            return Message(sourceLineNumbers, Ids.DuplicatePrimaryKey, "The primary key '{0}' is duplicated in table '{1}'. Please remove one of the entries or rename a part of the primary key to avoid the collision.", primaryKey, tableName);
         }
 
-        public static Message TooManySearchElements(SourceLineNumber sourceLineNumbers, string elementName)
+        public static Message FilePathRequired(string filePurpose)
         {
-            return Message(sourceLineNumbers, Ids.TooManySearchElements, "Only one search element can appear under a '{0}' element.", elementName);
+            return Message(null, Ids.FilePathRequired, "The path to the {0} is required.", filePurpose);
         }
 
-        public static Message TransformSchemaMismatch()
+        public static Message FilePathRequired(string parameter, string filePurpose)
         {
-            return Message(null, Ids.TransformSchemaMismatch, "The transform schema does not match the database schema. The transform may have been generated from a different database.");
+            return Message(null, Ids.FilePathRequired, "The parameter '{0}' must be followed by a file path for the {1}.", parameter, filePurpose);
         }
 
-        public static Message TypeSpecificationForExtensionRequired(string parameter)
+        public static Message IdentifierNotFound(string type, string identifier)
         {
-            return Message(null, Ids.TypeSpecificationForExtensionRequired, "The parameter '{0}' must be followed by the extension's type specification. The type specification should be a fully qualified class and assembly identity, for example: \"MyNamespace.MyClass,myextension.dll\".", parameter);
+            return Message(null, Ids.IdentifierNotFound, "An expected identifier ('{1}', of type '{0}') was not found.", type, identifier);
         }
 
-        public static Message UnableToGetAuthenticodeCertOfFile(string filePath, string moreInformation)
+        public static Message IllegalCharactersInPath(string pathName)
         {
-            return Message(null, Ids.UnableToGetAuthenticodeCertOfFile, "Unable to get the authenticode certificate of '{0}'. More information: {1}", filePath, moreInformation);
+            return Message(null, Ids.IllegalCharactersInPath, "Illegal characters in path '{0}'. Ensure you provided a valid path to the file.", pathName);
         }
 
-        public static Message UnableToGetAuthenticodeCertOfFileDownlevelOS(string filePath, string moreInformation)
+        public static Message IllegalCodepage(int codepage)
         {
-            return Message(null, Ids.UnableToGetAuthenticodeCertOfFileDownlevelOS, "Unable to get the authenticode certificate of '{0}'. The cryptography API has limitations on Windows XP and Windows Server 2003. More information: {1}", filePath, moreInformation);
+            return Message(null, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, or WixLocalization/@Codepage.", codepage);
         }
 
-        public static Message UnableToConvertFieldToNumber(string value)
+        public static Message IllegalCodepage(SourceLineNumber sourceLineNumbers, int codepage)
         {
-            return Message(null, Ids.UnableToConvertFieldToNumber, "Unable to convert intermediate symbol field value '{0}' to a number. This means the intermediate is corrupt or of an unsupported version.", value);
+            return Message(sourceLineNumbers, Ids.IllegalCodepage, "The code page '{0}' is not a valid Windows code page. Update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, or WixLocalization/@Codepage.", codepage);
         }
 
-        public static Message UnableToOpenModule(SourceLineNumber sourceLineNumbers, string modulePath, string message)
+        public static Message IllegalCommandLineArgumentValue(string arg, string value, IEnumerable<string> validValues)
         {
-            return Message(sourceLineNumbers, Ids.UnableToOpenModule, "Unable to open merge module '{0}'. Check to make sure the module language is correct. '{1}'", modulePath, message);
+            var combinedValidValues = String.Join(", ", validValues);
+            return Message(null, Ids.IllegalCommandLineArgumentValue, "The argument {0} value '{1}' is invalid. Use one of the following values {2}", arg, value, combinedValidValues);
         }
 
-        public static Message UnableToReadPackageInformation(SourceLineNumber sourceLineNumbers, string packagePath, string detailedErrorMessage)
+        public static Message IllegalEnvironmentVariable(string environmentVariable, string value)
         {
-            return Message(sourceLineNumbers, Ids.UnableToReadPackageInformation, "Unable to read package '{0}'. {1}", packagePath, detailedErrorMessage);
+            return Message(null, Ids.IllegalEnvironmentVariable, "The {0} environment variable is set to an invalid value of '{1}'.", environmentVariable, value);
         }
 
-        public static Message UnauthorizedAccess(string filePath)
+        public static Message IllegalGuidValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
         {
-            return Message(null, Ids.UnauthorizedAccess, "Access to the path '{0}' is denied.", filePath);
+            return Message(sourceLineNumbers, Ids.IllegalGuidValue, "The {0}/@{1} attribute's value, '{2}', is not a legal guid value.", elementName, attributeName, value);
         }
 
-        public static Message UndefinedPreprocessorFunction(SourceLineNumber sourceLineNumbers, string variableName)
+        public static Message IllegalVersionValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
         {
-            return Message(sourceLineNumbers, Ids.UndefinedPreprocessorFunction, "Undefined preprocessor function '$({0})'.", variableName);
+            return Message(sourceLineNumbers, Ids.IllegalVersionValue, "The {0}/@{1} attribute's value, '{2}', is not a valid version. Specify a four-part version or semantic version, such as '#.#.#.#' or '#.#.#-label.#'.", elementName, attributeName, value);
         }
 
-        public static Message UndefinedPreprocessorVariable(SourceLineNumber sourceLineNumbers, string variableName)
+        public static Message InvalidFileName(SourceLineNumber sourceLineNumbers, string fileName)
         {
-            return Message(sourceLineNumbers, Ids.UndefinedPreprocessorVariable, "Undefined preprocessor variable '$({0})'.", variableName);
+            return Message(sourceLineNumbers, Ids.InvalidFileName, "Invalid file name '{0}'.", fileName);
         }
 
-        public static Message UnexpectedAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
+        public static Message InvalidIdt(SourceLineNumber sourceLineNumbers, string idtFile)
         {
-            return Message(sourceLineNumbers, Ids.UnexpectedAttribute, "The {0} element contains an unexpected attribute '{1}'.", elementName, attributeName);
+            return Message(sourceLineNumbers, Ids.InvalidIdt, "There was an error importing the file '{0}'.", idtFile);
         }
 
-        public static Message UnexpectedColumnCount(SourceLineNumber sourceLineNumbers, string tableName)
+        public static Message InvalidIdt(SourceLineNumber sourceLineNumbers, string idtFile, string tableName)
         {
-            return Message(sourceLineNumbers, Ids.UnexpectedColumnCount, "A parsed row has more fields that contain data for table '{0}' than are defined. This is potentially because a standard table is being redefined as a custom table or is based on an older table schema.", tableName);
+            return Message(sourceLineNumbers, Ids.InvalidIdt, "There was an error importing table '{1}' from file '{0}'.", idtFile, tableName);
         }
 
-        public static Message UnexpectedContentNode(SourceLineNumber sourceLineNumbers, string elementName, string unexpectedNodeType)
+        public static Message InvalidValidatorMessageType(string type)
         {
-            return Message(sourceLineNumbers, Ids.UnexpectedContentNode, "The {0} element contains an unexpected xml node of type {1}.", elementName, unexpectedNodeType);
+            return Message(null, Ids.InvalidValidatorMessageType, "Unknown validation message type '{0}'.", type);
         }
 
-        public static Message UnexpectedCustomTableColumn(SourceLineNumber sourceLineNumbers, string column)
+        public static Message InvalidXml(SourceLineNumber sourceLineNumbers, string fileType, string detail)
         {
-            return Message(sourceLineNumbers, Ids.UnexpectedCustomTableColumn, "The custom table column '{0}' is unknown.", column);
+            return Message(sourceLineNumbers, Ids.InvalidXml, "Not a valid {0} file; detail: {1}", fileType, detail);
         }
 
-        public static Message UnexpectedElement(SourceLineNumber sourceLineNumbers, string elementName, string childElementName)
+        public static Message MissingTableDefinition(string tableName)
         {
-            return Message(sourceLineNumbers, Ids.UnexpectedElement, "The {0} element contains an unexpected child element '{1}'.", elementName, childElementName);
+            return Message(null, Ids.MissingTableDefinition, "Cannot find the table definitions for the '{0}' table. This is likely due to a typing error or missing extension. Please ensure all the necessary extensions are supplied on the command line with the -ext parameter.", tableName);
         }
 
         public static Message UnexpectedElementWithAttribute(SourceLineNumber sourceLineNumbers, string elementName, string childElementName, string attribute)
@@ -1991,21 +599,6 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.UnexpectedElementWithAttributeValue, "The {0} element cannot have a child element '{1}' unless attribute '{2}' is set to '{3}' or '{4}'.", elementName, childElementName, attribute, attributeValue1, attributeValue2);
         }
 
-        public static Message UnexpectedEmptySubexpression(SourceLineNumber sourceLineNumbers, string expression)
-        {
-            return Message(sourceLineNumbers, Ids.UnexpectedEmptySubexpression, "The empty subexpression is unexpected in the expression '{0}'.", expression);
-        }
-
-        public static Message UnexpectedException(Exception exception)
-        {
-            return Message(null, Ids.UnexpectedException, exception.ToString());
-        }
-
-        public static Message UnexpectedException(string message, string type, string stackTrace)
-        {
-            return Message(null, Ids.UnexpectedException, "{0}\r\n\r\nException Type: {1}\r\n\r\nStack Trace:\r\n{2}", message, type, stackTrace);
-        }
-
         public static Message UnexpectedExternalUIMessage(string message)
         {
             return Message(null, Ids.UnexpectedExternalUIMessage, "Error executing unknown ICE action. The following string format was not expected by the external UI message logger: \"{0}\".", message);
@@ -2016,116 +609,6 @@ namespace WixToolset.Data
             return Message(null, Ids.UnexpectedExternalUIMessage, "Error executing ICE action '{1}'. The following string format was not expected by the external UI message logger: \"{0}\".", message, action);
         }
 
-        public static Message UnexpectedFileExtension(string fileName, string expectedExtensions)
-        {
-            return Message(null, Ids.UnexpectedFileExtension, "The file '{0}' has an unexpected extension. Expected one of the following: '{1}'.", fileName, expectedExtensions);
-        }
-
-        public static Message UnexpectedFileFormat(string path, string expectedFormat, string actualFormat)
-        {
-            return Message(null, Ids.UnexpectedFileFormat, "Unexpected file format loaded from path: {0}. The file was expected to be a {1} but was actually: {2}. Ensure the correct path was provided.", path, expectedFormat.ToLowerInvariant(), actualFormat.ToLowerInvariant());
-        }
-
-        public static Message UnexpectedGroupChild(string parentType, string parentId, string childType, string childId)
-        {
-            return Message(null, Ids.UnexpectedGroupChild, "A group parent ('{0}'/'{1}') had an unexpected child ('{2}'/'{3}').", parentType, parentId, childType, childId);
-        }
-
-        public static Message UnexpectedLiteral(SourceLineNumber sourceLineNumbers, string expression)
-        {
-            return Message(sourceLineNumbers, Ids.UnexpectedLiteral, "An unexpected literal was found in the expression '{0}'.", expression);
-        }
-
-        public static Message UnexpectedPreprocessorOperator(SourceLineNumber sourceLineNumbers, string op)
-        {
-            return Message(sourceLineNumbers, Ids.UnexpectedPreprocessorOperator, "The operator '{0}' is unexpected.", op);
-        }
-
-        public static Message UnexpectedTableInMergeModule(SourceLineNumber sourceLineNumbers, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.UnexpectedTableInMergeModule, "An unexpected row in the '{0}' table was found in this merge module. Merge modules cannot contain the '{0}' table.", tableName);
-        }
-
-        public static Message UnexpectedTableInPatch(SourceLineNumber sourceLineNumbers, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.UnexpectedTableInPatch, "An unexpected row in the '{0}' table was found in this patch. Patches cannot contain the '{0}' table.", tableName);
-        }
-
-        public static Message UnhandledExtensionAttribute(SourceLineNumber sourceLineNumbers, string elementName, string extensionAttributeName, string extensionNamespace)
-        {
-            return Message(sourceLineNumbers, Ids.UnhandledExtensionAttribute, "The {0} element contains an unhandled extension attribute '{1}'. Please ensure that the extension for attributes in the '{2}' namespace has been provided.", elementName, extensionAttributeName, extensionNamespace);
-        }
-
-        public static Message UnhandledExtensionElement(SourceLineNumber sourceLineNumbers, string elementName, string extensionElementName, string extensionNamespace)
-        {
-            return Message(sourceLineNumbers, Ids.UnhandledExtensionElement, "The {0} element contains an unhandled extension element '{1}'. Please ensure that the extension for elements in the '{2}' namespace has been provided.", elementName, extensionElementName, extensionNamespace);
-        }
-
-        public static Message UniqueFileSearchIdRequired(SourceLineNumber sourceLineNumbers, string id, string elementName)
-        {
-            return Message(sourceLineNumbers, Ids.UniqueFileSearchIdRequired, "The DirectorySearch element '{0}' requires that the child {1} element has a unique Id when the DirectorySearch/@AssignToProperty attribute is set to 'yes'.", id, elementName);
-        }
-
-        public static Message UnknownCustomTableColumnType(SourceLineNumber sourceLineNumbers, string columnType)
-        {
-            return Message(sourceLineNumbers, Ids.UnknownCustomTableColumnType, "Encountered an unknown custom table column type '{0}'.", columnType);
-        }
-
-        public static Message UnmatchedParenthesisInExpression(SourceLineNumber sourceLineNumbers, string expression)
-        {
-            return Message(sourceLineNumbers, Ids.UnmatchedParenthesisInExpression, "The parenthesis don't match in the expression '{0}'.", expression);
-        }
-
-        public static Message UnmatchedPreprocessorInstruction(SourceLineNumber sourceLineNumbers, string beginInstruction, string endInstruction)
-        {
-            return Message(sourceLineNumbers, Ids.UnmatchedPreprocessorInstruction, "Found a <?{1}?> processing instruction without a matching <?{0}?> before it.", beginInstruction, endInstruction);
-        }
-
-        public static Message UnmatchedQuotesInExpression(SourceLineNumber sourceLineNumbers, string expression)
-        {
-            return Message(sourceLineNumbers, Ids.UnmatchedQuotesInExpression, "The quotes don't match in the expression '{0}'.", expression);
-        }
-
-        public static Message UnresolvedBindReference(SourceLineNumber sourceLineNumbers, string BindRef)
-        {
-            return Message(sourceLineNumbers, Ids.UnresolvedBindReference, "Unresolved bind-time variable {0}.", BindRef);
-        }
-
-        public static Message UnresolvedReference(SourceLineNumber sourceLineNumbers, string symbolName)
-        {
-            return Message(sourceLineNumbers, Ids.UnresolvedReference, "The identifier '{0}' could not be found. Ensure you have typed the reference correctly and that all the necessary inputs are provided to the linker.", symbolName);
-        }
-
-        public static Message UnresolvedReference(SourceLineNumber sourceLineNumbers, string symbolName, WixToolset.Data.AccessModifier accessModifier)
-        {
-            return Message(sourceLineNumbers, Ids.UnresolvedReference, "The identifier '{0}' is inaccessible due to its protection level.", symbolName, accessModifier);
-        }
-
-        public static Message UnsupportedAllUsersValue(SourceLineNumber sourceLineNumbers, string path, string value)
-        {
-            return Message(sourceLineNumbers, Ids.UnsupportedAllUsersValue, "The MSI '{0}' set the ALLUSERS Property to '{0}' which is not supported. Remove the Property with Id='ALLUSERS' and use Package/@Scope attribute instead.", path, value);
-        }
-
-        public static Message UnsupportedExtensionAttribute(SourceLineNumber sourceLineNumbers, string elementName, string extensionElementName)
-        {
-            return Message(sourceLineNumbers, Ids.UnsupportedExtensionAttribute, "The {0} element contains an unsupported extension attribute '{1}'. The {0} element does not currently support extension attributes. Is the {1} attribute using the correct XML namespace?", elementName, extensionElementName);
-        }
-
-        public static Message UnsupportedExtensionElement(SourceLineNumber sourceLineNumbers, string elementName, string extensionElementName)
-        {
-            return Message(sourceLineNumbers, Ids.UnsupportedExtensionElement, "The {0} element contains an unsupported extension element '{1}'. The {0} element does not currently support extension elements. Is the {1} element using the correct XML namespace?", elementName, extensionElementName);
-        }
-
-        public static Message UnsupportedPlatformForElement(SourceLineNumber sourceLineNumbers, string platform, string elementName)
-        {
-            return Message(sourceLineNumbers, Ids.UnsupportedPlatformForElement, "The element {1} does not support platform '{0}'. Consider removing the element or using the preprocessor to conditionally include the element based on the platform.", platform, elementName);
-        }
-
-        public static Message ValidationError(SourceLineNumber sourceLineNumbers, string ice, string message)
-        {
-            return Message(sourceLineNumbers, Ids.ValidationError, "{0}: {1}", ice, message);
-        }
-
         public static Message ValidationFailedDueToInvalidPackage()
         {
             return Message(null, Ids.ValidationFailedDueToInvalidPackage, "Failed to open package for validation. The most common cause of this error is validating an x64 package on an x86 system. To fix this error, run validation on an x64 system or disable validation.");
@@ -2146,31 +629,6 @@ namespace WixToolset.Data
             return Message(null, Ids.ValidationFailedToOpenDatabase, "Failed to open the database. During validation, this most commonly happens when attempting to open a database using an unsupported code page or a file that is not a valid Windows Installer database. Please use a different code page in Module/@Codepage, Package/@SummaryCodepage, Package/@Codepage, or WixLocalization/@Codepage; or make sure you provide the path to a valid Windows Installer database.");
         }
 
-        public static Message ValueAndMaskMustBeSameLength(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.ValueAndMaskMustBeSameLength, "The FileTypeMask/@Value and FileTypeMask/@Mask attributes must be the same length.");
-        }
-
-        public static Message ValueNotSupported(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue)
-        {
-            return Message(sourceLineNumbers, Ids.ValueNotSupported, "The {0}/@{1} attribute's value, '{2}, is not supported by the Windows Installer.", elementName, attributeName, attributeValue);
-        }
-
-        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 VersionIndependentProgIdsCannotHaveIcons(SourceLineNumber sourceLineNumbers)
-        {
-            return Message(sourceLineNumbers, Ids.VersionIndependentProgIdsCannotHaveIcons, "Version independent ProgIds cannot have Icons. Remove the Icon and/or IconIndex attributes from your ProgId element.");
-        }
-
-        public static Message VersionMismatch(SourceLineNumber sourceLineNumbers, string fileType, string version, string expectedVersion)
-        {
-            return Message(sourceLineNumbers, Ids.VersionMismatch, "The {0} file format version {1} is not compatible with the expected {0} file format version {2}.", fileType, version, expectedVersion);
-        }
-
         public static Message Win32Exception(int nativeErrorCode, string message)
         {
             return Message(null, Ids.Win32Exception, "An unexpected Win32 exception with error code 0x{0:X} occurred: {1}", nativeErrorCode, message);
@@ -2181,66 +639,6 @@ namespace WixToolset.Data
             return Message(null, Ids.Win32Exception, "An unexpected Win32 exception with error code 0x{0:X} occurred while accessing file '{1}': {2}", nativeErrorCode, file, message);
         }
 
-        public static Message WixFileNotFound(string file)
-        {
-            return Message(null, Ids.WixFileNotFound, "The file '{0}' cannot be found.", file);
-        }
-
-        public static Message BindVariableCollision(SourceLineNumber sourceLineNumbers, string variableId)
-        {
-            return Message(sourceLineNumbers, Ids.BindVariableCollision, "The bind variable '{0}' is declared in more than one location. Please remove one of the declarations.", variableId);
-        }
-
-        public static Message BindVariableUnknown(SourceLineNumber sourceLineNumbers, string variableId)
-        {
-            return Message(sourceLineNumbers, Ids.BindVariableUnknown, "The bind variable !(wix.{0}) is unknown. Please ensure the variable is declared on the command line for wix.exe, via a WixVariable element, or inline using the syntax !(wix.{0}=some value which doesn't contain parentheses).", variableId);
-        }
-
-        public static Message NoSourceFiles()
-        {
-            return Message(null, Ids.NoSourceFiles, "No source files specified.");
-        }
-
-        public static Message WixiplSourceFileIsExclusive()
-        {
-            return Message(null, Ids.WixiplSourceFileIsExclusive, "When an intermediate post link source file is specified, it must be the only source file provided.");
-        }
-
-        public static Message IntermediatesMustBeCompiled(string invalidIntermediates)
-        {
-            return Message(null, Ids.IntermediatesMustBeCompiled, "Intermediates being linked must have been compiled. Intermediates with these ids were not compiled: {0}", invalidIntermediates);
-        }
-
-        public static Message IntermediatesMustBeResolved(string invalidIntermediate)
-        {
-            return Message(null, Ids.IntermediatesMustBeResolved, "Intermediates being bound must have been resolved. This intermediate was not resolved: {0}", invalidIntermediate);
-        }
-
-        public static Message UnknownSymbolType(string symbolName)
-        {
-            return Message(null, Ids.UnknownSymbolType, "Could not deserialize symbol of type type '{0}' because it is not a standard symbol type or one provided by a loaded extension.", symbolName);
-        }
-
-        public static Message IllegalInnerText(SourceLineNumber sourceLineNumbers, string elementName, string innerText)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalInnerText, "The {0} element contains illegal inner text: '{1}'.", elementName, innerText);
-        }
-
-        public static Message IllegalInnerText(SourceLineNumber sourceLineNumbers, string elementName, string innerText, string attributeName)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalInnerText, "The {0} element contains inner text which is obsolete. Use the {1} attribute instead.", elementName, attributeName);
-        }
-
-        public static Message IllegalAttributeWhenNested(SourceLineNumber sourceLineNumbers, string attributeName)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalAttributeWhenNested, "The File element contains an attribute '{0}' that cannot be used in a File element that is a child of a Component element.", attributeName);
-        }
-
-        public static Message OverlengthTableNameInProductOrMergeModule(SourceLineNumber sourceLineNumbers, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.OverlengthTableNameInProductOrMergeModule, "The table name '{0}' is invalid because the table name exceeds 31 characters in length. For more information, see: https://learn.microsoft.com/en-au/windows/win32/msi/table-names", tableName);
-        }
-
         private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
         {
             return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args);
@@ -2259,385 +657,77 @@ namespace WixToolset.Data
             UnexpectedAttribute = 4,
             UnexpectedElement = 5,
             IllegalEmptyAttributeValue = 6,
-            InsufficientVersion = 7,
             IllegalIntegerValue = 8,
             IllegalGuidValue = 9,
             ExpectedAttribute = 10,
-            SecurePropertyNotUppercase = 11,
-            SearchPropertyNotUppercase = 12,
             StreamNameTooLong = 13,
             IllegalIdentifier = 14,
             IllegalYesNoValue = 15,
             CommandLineCommandRequired = 16,
-            CabExtractionFailed = 17,
-            AppIdIncompatibleAdvertiseState = 18,
-            IllegalAttributeWhenAdvertised = 19,
-            ConditionExpected = 20,
             IllegalAttributeValue = 21,
-            CustomActionMultipleSources = 22,
-            CustomActionMultipleTargets = 23,
-            IllegalShortFilename = 26,
             IllegalLongFilename = 27,
-            TableNameTooLong = 28,
-            FeatureConfigurableDirectoryNotUppercase = 29,
-            FeatureCannotFavorAndDisallowAdvertise = 30,
-            FeatureCannotFollowParentAndFavorLocalOrSource = 31,
-            MediaEmbeddedCabinetNameTooLong = 32,
-            RegistrySubElementCannotBeRemoved = 33,
-            RegistryMultipleValuesWithoutMultiString = 34,
             IllegalAttributeWithOtherAttribute = 35,
             IllegalAttributeWithOtherAttributes = 36,
             IllegalAttributeWithoutOtherAttributes = 37,
             IllegalAttributeValueWithoutOtherAttribute = 38,
             IntegralValueSentinelCollision = 39,
-            ExampleGuid = 40,
-            TooManyChildren = 41,
-            ComponentMultipleKeyPaths = 42,
             ExpectedAttributes = 44,
             ExpectedAttributesWithOtherAttribute = 45,
             ExpectedAttributesWithoutOtherAttribute = 46,
-            MissingTypeLibFile = 47,
             InvalidDocumentElement = 48,
             ExpectedAttributeInElementOrParent = 49,
-            UnauthorizedAccess = 50,
-            IllegalModuleExclusionLanguageAttributes = 51,
-            NoFirstControlSpecified = 52,
-            NoDataForColumn = 53,
-            ValueAndMaskMustBeSameLength = 54,
-            TooManySearchElements = 55,
             IllegalAttributeExceptOnElement = 56,
-            SearchElementRequired = 57,
-            MultipleIdentifiersFound = 58,
-            AdvertiseStateMustMatch = 59,
-            DuplicateContextValue = 60,
-            RelativePathForRegistryElement = 61,
             IllegalAttributeWhenNested = 62,
             ExpectedElement = 63,
-            RegistryRootInvalid = 64,
-            IllegalYesNoDefaultValue = 65,
-            IllegalAttributeInMergeModule = 66,
             GenericReadNotAllowed = 67,
-            IllegalAttributeWithInnerText = 68,
-            SearchElementRequiredWithAttribute = 69,
-            CannotAuthorSpecialProperties = 70,
-            NeedSequenceBeforeOrAfter = 72,
-            ValueNotSupported = 73,
-            TabbableControlNotAllowedInBillboard = 74,
-            CheckBoxValueOnlyValidWithCheckBox = 75,
-            CabFileDoesNotExist = 76,
-            RadioButtonTypeInconsistent = 77,
-            RadioButtonBitmapAndIconDisallowed = 78,
-            IllegalSuppressWarningId = 79,
-            PreprocessorIllegalForeachVariable = 80,
-            PreprocessorMissingParameterPrefix = 81,
-            PreprocessorExtensionForParameterMissing = 82,
-            CannotFindFile = 83,
-            BinderFileManagerMissingFile = 84,
             InvalidFileName = 85,
-            ReferenceLoopDetected = 86,
-            GuidContainsLowercaseLetters = 87,
-            InvalidDateTimeFormat = 88,
-            MultipleEntrySections = 89,
-            MultipleEntrySections2 = 90,
-            MissingEntrySection = 93,
-            UnresolvedReference = 94,
-            MultiplePrimaryReferences = 95,
-            ComponentReferencedTwice = 96,
-            DuplicateModuleFileIdentifier = 97,
-            DuplicateModuleCaseInsensitiveFileIdentifier = 98,
-            ImplicitComponentKeyPath = 99,
-            DuplicateLocalizationIdentifier = 100,
-            LocalizationVariableUnknown = 102,
             FileNotFound = 103,
             InvalidXml = 104,
-            ProgIdNestedTooDeep = 105,
-            CanNotHaveTwoParents = 106,
-            SchemaValidationFailed = 107,
             IllegalVersionValue = 108,
-            CustomTableNameTooLong = 109,
-            CustomTableIllegalColumnWidth = 110,
-            CustomTableMissingPrimaryKey = 111,
-            TypeSpecificationForExtensionRequired = 113,
             FilePathRequired = 114,
-            DirectoryPathRequired = 115,
-            FileOrDirectoryPathRequired = 116,
-            PathCannotContainQuote = 117,
-            AdditionalArgumentUnexpected = 118,
-            RegistryNameValueIncorrect = 119,
-            FamilyNameTooLong = 120,
-            IllegalFamilyName = 121,
-            IllegalLongValue = 122,
             IntegralValueOutOfRange = 123,
-            DuplicateExtensionXmlSchemaNamespace = 125,
-            DuplicateExtensionTable = 126,
-            DuplicateExtensionPreprocessorType = 127,
-            FileInUse = 128,
-            CannotOpenMergeModule = 129,
             DuplicatePrimaryKey = 130,
-            FileIdentifierNotFound = 131,
-            InvalidAssemblyFile = 132,
-            ExpectedEndElement = 133,
             IllegalCodepage = 134,
-            ExpectedMediaCabinet = 135,
             InvalidIdt = 136,
-            InvalidSequenceTable = 137,
-            ExpectedDirectory = 138,
-            ComponentExpectedFeature = 139,
-            RecursiveAction = 140,
             VersionMismatch = 141,
-            UnexpectedContentNode = 142,
-            UnexpectedColumnCount = 143,
-            InvalidExtension = 144,
-            InvalidSubExpression = 145,
-            UnmatchedPreprocessorInstruction = 146,
-            NonterminatedPreprocessorInstruction = 147,
-            ExpectedExpressionAfterNot = 148,
-            InvalidPreprocessorVariable = 149,
-            UndefinedPreprocessorVariable = 150,
-            IllegalDefineStatement = 151,
-            VariableDeclarationCollision = 152,
-            CannotReundefineVariable = 153,
-            IllegalForeach = 154,
             IllegalParentAttributeWhenNested = 155,
-            ExpectedEndforeach = 156,
-            UnmatchedQuotesInExpression = 158,
-            UnmatchedParenthesisInExpression = 159,
-            ExpectedVariable = 160,
-            UnexpectedLiteral = 161,
-            IllegalIntegerInExpression = 162,
-            UnexpectedPreprocessorOperator = 163,
-            UnexpectedEmptySubexpression = 164,
-            UnexpectedCustomTableColumn = 165,
-            UnknownCustomTableColumnType = 166,
             IllegalFileCompressionAttributes = 167,
-            OverridableActionCollision = 168,
-            OverridableActionCollision2 = 169,
-            ActionCollision = 170,
-            ActionCollision2 = 171,
-            SuppressNonoverridableAction = 172,
-            SuppressNonoverridableAction2 = 173,
-            CustomActionSequencedInModule = 174,
-            StandardActionRelativelyScheduledInModule = 175,
-            ActionCircularDependency = 176,
-            ActionScheduledRelativeToTerminationAction = 177,
-            ActionScheduledRelativeToTerminationAction2 = 178,
-            NoUniqueActionSequenceNumber = 179,
-            NoUniqueActionSequenceNumber2 = 180,
-            ActionScheduledRelativeToItself = 181,
             MissingTableDefinition = 182,
-            UnexpectedTableInMergeModule = 184,
-            MergeExcludedModule = 186,
-            MergeFeatureRequired = 187,
-            MergeLanguageFailed = 188,
-            MergeLanguageUnsupported = 189,
-            TableDecompilationUnimplemented = 190,
-            CannotDefaultMismatchedAdvertiseStates = 191,
-            VersionIndependentProgIdsCannotHaveIcons = 192,
             IllegalAttributeValueWithOtherAttribute = 193,
-            InvalidMergeLanguage = 194,
-            BindVariableCollision = 195,
-            ExpectedBindVariableValue = 196,
-            BindVariableUnknown = 197,
-            IllegalBindVariablePrefix = 198,
             InvalidWixXmlNamespace = 199,
-            UnhandledExtensionElement = 200,
-            UnhandledExtensionAttribute = 201,
-            UnsupportedExtensionAttribute = 202,
-            UnsupportedExtensionElement = 203,
-            ValidationError = 204,
-            IllegalRootDirectory = 205,
-            IllegalTargetDirDefaultDir = 206,
             TooManyElements = 207,
-            ExpectedBinaryCategory = 208,
-            RootFeatureCannotFollowParent = 209,
-            FeatureNameTooLong = 210,
-            SignedEmbeddedCabinet = 211,
-            ExpectedSignedCabinetName = 212,
-            IllegalInlineLocVariable = 213,
-            MergeModuleExpectedFeature = 215,
             Win32Exception = 216,
             UnexpectedExternalUIMessage = 217,
-            IllegalCabbingThreadCount = 218,
             IllegalEnvironmentVariable = 219,
-            InvalidKeyColumn = 220,
             CollidingModularizationTypes = 221,
             CubeFileNotFound = 222,
-            OutputTypeMismatch = 224,
             RealTableMissingPrimaryKeyColumn = 225,
-            IllegalColumnName = 226,
-            NoDifferencesInTransform = 227,
-            OutputCodepageMismatch = 228,
-            OutputCodepageMismatch2 = 229,
             IllegalComponentWithAutoGeneratedGuid = 230,
-            IllegalPathForGeneratedComponentGuid = 231,
-            IllegalTerminalServerCustomActionAttributes = 232,
-            IllegalPropertyCustomActionAttributes = 233,
-            InvalidPreprocessorFunction = 234,
-            UndefinedPreprocessorFunction = 235,
-            PreprocessorExtensionEvaluateFunctionFailed = 236,
-            PreprocessorExtensionGetVariableValueFailed = 237,
-            InvalidManifestContent = 238,
-            InvalidWixTransform = 239,
-            UnexpectedFileExtension = 240,
-            UnexpectedTableInPatch = 241,
-            InvalidKeypathChange = 243,
-            MissingValidatorExtension = 244,
             InvalidValidatorMessageType = 245,
-            PatchWithoutTransforms = 246,
-            SingleExtensionSupported = 247,
-            DuplicateTransform = 248,
-            BaselineRequired = 249,
-            PreprocessorError = 250,
-            ExpectedArgument = 251,
-            PatchWithoutValidTransforms = 252,
-            ExpectedDecompiler = 253,
-            ExpectedTableInMergeModule = 254,
             UnexpectedElementWithAttributeValue = 255,
-            ExpectedPatchIdInWixMsp = 256,
-            ExpectedMediaRowsInWixMsp = 257,
-            WixFileNotFound = 258,
-            ExpectedClientPatchIdInWixMsp = 259,
-            NewRowAddedInTable = 260,
-            PatchNotRemovable = 261,
-            PathTooLong = 262,
-            FileTooLarge = 263,
             InvalidPlatformParameter = 264,
-            InvalidPlatformValue = 265,
-            IllegalValidationArguments = 266,
-            OrphanedComponent = 267,
             IllegalCommandLineArgumentValue = 268,
-            ProductCodeInvalidForTransform = 269,
-            InsertInvalidSequenceActionOrder = 270,
-            InsertSequenceNoSpace = 271,
-            MissingManifestForWin32Assembly = 272,
-            UnableToOpenModule = 273,
             ExpectedAttributeWhenElementNotUnderElement = 274,
-            IllegalIdentifierLooksLikeFormatted = 275,
-            IllegalCodepageAttribute = 276,
-            IllegalCompressionLevel = 277,
-            TransformSchemaMismatch = 278,
-            DatabaseSchemaMismatch = 279,
-            ExpectedDirectoryGotFile = 280,
-            ExpectedFileGotDirectory = 281,
-            GacAssemblyNoStrongName = 282,
-            FileWriteError = 283,
-            InvalidCommandLineFileName = 284,
             ExpectedParentWithAttribute = 285,
-            IllegalWarningIdAsError = 286,
-            ExpectedAttributeOrElement = 287,
-            DuplicateVariableDefinition = 288,
-            InvalidVariableDefinition = 289,
-            DuplicateCabinetName = 290,
-            DuplicateCabinetName2 = 291,
-            InvalidAddedFileRowWithoutSequence = 292,
-            DuplicateFileId = 293,
-            FullTempDirectory = 294,
-            CreateCabAddFileFailed = 296,
-            CreateCabInsufficientDiskSpace = 297,
-            UnresolvedBindReference = 298,
-            GACAssemblyIdentityWarning = 299,
             IllegalCharactersInPath = 300,
             ValidationFailedToOpenDatabase = 301,
-            MustSpecifyOutputWithMoreThanOneInput = 302,
-            IllegalSearchIdForParentDepth = 303,
             IdentifierTooLongError = 304,
-            InvalidRemoveComponent = 305,
-            FinishCabFailed = 306,
-            InvalidExtensionType = 307,
             ValidationFailedDueToMultilanguageMergeModule = 309,
             ValidationFailedDueToInvalidPackage = 310,
-            InvalidStringForCodepage = 311,
-            InvalidEmbeddedUIFileName = 312,
-            UniqueFileSearchIdRequired = 313,
             IllegalAttributeValueWhenNested = 314,
-            AdminImageRequired = 315,
-            SamePatchBaselineId = 316,
-            SameFileIdDifferentSource = 317,
-            HarvestSourceNotSpecified = 318,
-            OutputTargetNotSpecified = 319,
-            BothUpgradeCodesRequired = 322,
-            IllegalBinderClassName = 323,
-            SpecifiedBinderNotFound = 324,
-            UnableToGetAuthenticodeCertOfFile = 327,
-            UnableToGetAuthenticodeCertOfFileDownlevelOS = 328,
-            ReadOnlyOutputFile = 329,
-            CannotDefaultComponentId = 330,
-            ParentElementAttributeRequired = 331,
-            PreprocessorExtensionPragmaFailed = 333,
-            InvalidPreprocessorPragma = 334,
-            InvalidStubExe = 338,
-            StubMissingWixburnSection = 339,
-            StubWixburnSectionTooSmall = 340,
-            MissingBundleInformation = 341,
-            UnexpectedGroupChild = 342,
-            OrderingReferenceLoopDetected = 343,
             IdentifierNotFound = 344,
-            MergePlatformMismatch = 345,
             IllegalRelativeLongFilename = 346,
             IllegalAttributeValueWithLegalList = 347,
-            IllegalAttributeValueWithIllegalList = 348,
-            InvalidSummaryInfoCodePage = 349,
             ValidationFailedDueToLowMsiEngine = 350,
-            DuplicateSourcesForOutput = 351,
-            UnableToReadPackageInformation = 352,
-            MultipleFilesMatchedWithOutputSpecification = 353,
-            InvalidBundle = 354,
-            BundleTooNew = 355,
-            MediaTableCollision = 357,
-            InvalidCabinetTemplate = 358,
-            MaximumUncompressedMediaSizeTooLarge = 359,
-            ReservedNamespaceViolation = 362,
-            PerUserButAllUsersEquals1 = 363,
-            UnsupportedAllUsersValue = 364,
-            DisallowedMsiProperty = 365,
-            MissingOrInvalidModuleInstallerVersion = 366,
-            IllegalGeneratedGuidComponentUnversionedKeypath = 367,
-            IllegalGeneratedGuidComponentVersionedNonkeypath = 368,
-            DuplicateComponentGuids = 369,
-            DuplicateProviderDependencyKey = 370,
-            MissingDependencyVersion = 371,
             UnexpectedElementWithAttribute = 372,
-            ExpectedAttributeWithElement = 373,
-            DuplicatedUiLocalization = 374,
-            MaximumCabinetSizeForLargeFileSplittingTooLarge = 375,
-            SplitCabinetCopyRegistrationFailed = 376,
-            SplitCabinetNameCollision = 377,
-            InvalidPreprocessorFunctionAutoVersion = 379,
-            InvalidFourPartVersion = 380,
             UnsupportedPlatformForElement = 381,
-            MissingMedia = 382,
-            IllegalYesNoAlwaysValue = 384,
-            TooDeeplyIncluded = 385,
-            TooManyColumnsInRealTable = 386,
-            InlineDirectorySyntaxRequiresPath = 387,
-            InsecureBundleFilename = 388,
             PayloadMustBeRelativeToCache = 389,
-            MsiTransactionX86BeforeX64Package = 390,
-            NoSourceFiles = 391,
-            WixiplSourceFileIsExclusive = 392,
             UnableToConvertFieldToNumber = 393,
-            CouldNotDetermineProductCodeFromTransformSummaryInfo = 394,
-            IntermediatesMustBeCompiled = 395,
-            IntermediatesMustBeResolved = 396,
-            MissingBundleSearch = 397,
-            CircularSearchReference = 398,
             UnknownSymbolType = 399,
-            IllegalInnerText = 400,
             ExpectedAttributeWithValueWithOtherAttribute = 401,
-            PackagePayloadUnsupported = 402,
-            PackagePayloadUnsupported2 = 403,
-            MultiplePackagePayloads = 404,
-            MultiplePackagePayloads2 = 405,
-            MultiplePackagePayloads3 = 406,
-            MissingPackagePayload = 407,
             ExpectedAttributeWithoutOtherAttributes = 408,
-            InvalidBundleCondition = 409,
-            MsiTransactionX86BeforeX64Package2 = 410,
-            MsiTransactionInvalidPackage = 411,
-            MsiTransactionInvalidPackage2 = 412,
             ExpectedAttributeOrElementWithOtherAttribute = 413,
             ExpectedAttributeOrElementWithoutOtherAttribute = 414,
-            OverlengthTableNameInProductOrMergeModule = 415
         }
     }
 }
diff --git a/src/ext/Bal/wixext/BalCompiler.cs b/src/ext/Bal/wixext/BalCompiler.cs
index b7d5f679..c2959c5d 100644
--- a/src/ext/Bal/wixext/BalCompiler.cs
+++ b/src/ext/Bal/wixext/BalCompiler.cs
@@ -433,7 +433,7 @@ namespace WixToolset.BootstrapperApplications
             // Error check the values.
             if (String.IsNullOrEmpty(condition))
             {
-                this.Messaging.Write(ErrorMessages.ConditionExpected(sourceLineNumbers, node.Name.LocalName));
+                this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Condition"));
             }
 
             if (null == message)
diff --git a/src/ext/Firewall/wixext/FirewallErrors.cs b/src/ext/Firewall/wixext/FirewallErrors.cs
index 523398e5..6e1c743a 100644
--- a/src/ext/Firewall/wixext/FirewallErrors.cs
+++ b/src/ext/Firewall/wixext/FirewallErrors.cs
@@ -36,6 +36,7 @@ namespace WixToolset.Firewall
         {
             return Message(sourceLineNumbers, Ids.IllegalInterfaceTypeWithInterfaceTypeAll, "The InterfaceType element cannot be specified because its parent FirewallException contains another InterfaceType element with value 'All'.");
         }
+
         public static Message IllegalLocalAddressWithLocalScopeAttribute(SourceLineNumber sourceLineNumbers)
         {
             return Message(sourceLineNumbers, Ids.IllegalLocalAddressWithLocalScopeAttribute, "The LocalAddress element cannot be specified because its parent FirewallException already specified the LocalScope attribute. To use LocalAddress elements, omit the LocalScope attribute.");
diff --git a/src/ext/Sql/wixext/SqlErrors.cs b/src/ext/Sql/wixext/SqlErrors.cs
index f25728bd..f950e137 100644
--- a/src/ext/Sql/wixext/SqlErrors.cs
+++ b/src/ext/Sql/wixext/SqlErrors.cs
@@ -11,17 +11,17 @@ namespace WixToolset.Sql
         {
             return Message(sourceLineNumbers, Ids.IllegalAttributeWithoutComponent, "The {0}/@{1} attribute cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName, attributeName);
         }
-        
+
         public static Message IllegalElementWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName)
         {
             return Message(sourceLineNumbers, Ids.IllegalElementWithoutComponent, "The {0} element cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName);
         }
-        
+
         public static Message OneOfAttributesRequiredUnderComponent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName1, string attributeName2, string attributeName3, string attributeName4)
         {
             return Message(sourceLineNumbers, Ids.OneOfAttributesRequiredUnderComponent, "When nested under a Component, the {0} element must have one of the following attributes specified: {1}, {2}, {3} or {4}.", elementName, attributeName1, attributeName2, attributeName3, attributeName4);
         }
-        
+
         public static Message DeprecatedBinaryChildElement(SourceLineNumber sourceLineNumbers, string elementName)
         {
             return Message(sourceLineNumbers, Ids.DeprecatedBinaryChildElement, "The {0} element contains a deprecated child Binary element.  Please move the Binary element under a Fragment, Module, or Product element and set the {0}/@BinaryKey attribute to the value of the Binary/@Id attribute.", elementName);
@@ -45,4 +45,4 @@ namespace WixToolset.Sql
             DeprecatedBinaryChildElement = 5103,
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ext/Sql/wixext/SqlExtensionFactory.cs b/src/ext/Sql/wixext/SqlExtensionFactory.cs
index 279106d3..064b68f1 100644
--- a/src/ext/Sql/wixext/SqlExtensionFactory.cs
+++ b/src/ext/Sql/wixext/SqlExtensionFactory.cs
@@ -1,4 +1,4 @@
-// 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.
+// 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.Sql
 {
diff --git a/src/ext/Sql/wixext/Symbols/SqlDatabaseSymbol.cs b/src/ext/Sql/wixext/Symbols/SqlDatabaseSymbol.cs
index 6f0820ac..bb31fbb2 100644
--- a/src/ext/Sql/wixext/Symbols/SqlDatabaseSymbol.cs
+++ b/src/ext/Sql/wixext/Symbols/SqlDatabaseSymbol.cs
@@ -100,4 +100,4 @@ namespace WixToolset.Sql.Symbols
             set => this.Set((int)SqlDatabaseSymbolFields.Attributes, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ext/Sql/wixext/Symbols/SqlFileSpecSymbol.cs b/src/ext/Sql/wixext/Symbols/SqlFileSpecSymbol.cs
index d9eecc62..302bae2b 100644
--- a/src/ext/Sql/wixext/Symbols/SqlFileSpecSymbol.cs
+++ b/src/ext/Sql/wixext/Symbols/SqlFileSpecSymbol.cs
@@ -76,4 +76,4 @@ namespace WixToolset.Sql.Symbols
             set => this.Set((int)SqlFileSpecSymbolFields.GrowthSize, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ext/Sql/wixext/Symbols/SqlScriptSymbol.cs b/src/ext/Sql/wixext/Symbols/SqlScriptSymbol.cs
index 94c70390..1676f181 100644
--- a/src/ext/Sql/wixext/Symbols/SqlScriptSymbol.cs
+++ b/src/ext/Sql/wixext/Symbols/SqlScriptSymbol.cs
@@ -84,4 +84,4 @@ namespace WixToolset.Sql.Symbols
             set => this.Set((int)SqlScriptSymbolFields.Sequence, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/ext/Sql/wixext/Symbols/SqlStringSymbol.cs b/src/ext/Sql/wixext/Symbols/SqlStringSymbol.cs
index 73a8206e..ccf4fd0f 100644
--- a/src/ext/Sql/wixext/Symbols/SqlStringSymbol.cs
+++ b/src/ext/Sql/wixext/Symbols/SqlStringSymbol.cs
@@ -84,4 +84,4 @@ namespace WixToolset.Sql.Symbols
             set => this.Set((int)SqlStringSymbolFields.Sequence, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
index 2ba1d3a2..83dfb606 100644
--- a/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bind/BindBundleCommand.cs
@@ -309,7 +309,7 @@ namespace WixToolset.Core.Burn
                 if (0 == uxPayloadIndex)
                 {
                     // If we didn't get any UX payloads, it's an error!
-                    throw new WixException(ErrorMessages.MissingBundleInformation("bootstrapper application"));
+                    throw new WixException(BurnBackendErrors.MissingBundleInformation("bootstrapper application"));
                 }
 
                 // Give the embedded payloads without an embedded id yet an embedded id.
@@ -642,7 +642,7 @@ namespace WixToolset.Core.Burn
 
             if (0 == symbols.Count)
             {
-                throw new WixException(ErrorMessages.MissingBundleInformation(typeof(T).Name));
+                throw new WixException(BurnBackendErrors.MissingBundleInformation(typeof(T).Name));
             }
 
             return symbols;
@@ -654,7 +654,7 @@ namespace WixToolset.Core.Burn
 
             if (0 == symbols.Count)
             {
-                throw new WixException(ErrorMessages.MissingBundleInformation(elementName));
+                throw new WixException(BurnBackendErrors.MissingBundleInformation(elementName));
             }
             else if (1 < symbols.Count)
             {
diff --git a/src/wix/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs b/src/wix/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs
index 992ce3d6..deb97820 100644
--- a/src/wix/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bind/ProcessDependencyProvidersCommand.cs
@@ -85,7 +85,7 @@ namespace WixToolset.Core.Burn.Bind
                     // If the version is still missing, a version could not be gathered from the package and was not authored.
                     if (String.IsNullOrEmpty(dependency.Version))
                     {
-                        this.Messaging.Write(ErrorMessages.MissingDependencyVersion(facade.PackageId));
+                        this.Messaging.Write(BurnBackendErrors.MissingDependencyVersion(facade.PackageId));
                     }
 
                     if (String.IsNullOrEmpty(dependency.DisplayName))
@@ -138,7 +138,7 @@ namespace WixToolset.Core.Burn.Bind
                         dependency.Version != collision.Version ||
                         dependency.DisplayName != collision.DisplayName)
                     {
-                        this.Messaging.Write(ErrorMessages.DuplicateProviderDependencyKey(dependency.ProviderKey, dependency.ParentRef));
+                        this.Messaging.Write(BurnBackendErrors.DuplicateProviderDependencyKey(dependency.ProviderKey, dependency.ParentRef));
                     }
                 }
                 else
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/BurnCommon.cs b/src/wix/WixToolset.Core.Burn/Bundles/BurnCommon.cs
index f90a089b..066ef9db 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/BurnCommon.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/BurnCommon.cs
@@ -220,7 +220,7 @@ namespace WixToolset.Core.Burn.Bundles
             var uint32 = BurnCommon.ReadUInt32(bytes, BURN_SECTION_OFFSET_MAGIC);
             if (BURN_SECTION_MAGIC != uint32)
             {
-                this.Messaging.Write(ErrorMessages.InvalidBundle(this.fileExe));
+                this.Messaging.Write(BurnBackendErrors.InvalidBundle(this.fileExe));
                 return false;
             }
 
@@ -234,7 +234,7 @@ namespace WixToolset.Core.Burn.Bundles
             uint32 = BurnCommon.ReadUInt32(bytes, BURN_SECTION_OFFSET_FORMAT); // We only know how to deal with CABs right now
             if (1 != uint32)
             {
-                this.Messaging.Write(ErrorMessages.InvalidBundle(this.fileExe));
+                this.Messaging.Write(BurnBackendErrors.InvalidBundle(this.fileExe));
                 return false;
             }
 
@@ -248,7 +248,7 @@ namespace WixToolset.Core.Burn.Bundles
             uint uxSize = 0;
             if (this.wixburnMaxContainers < containerCount)
             {
-                this.Messaging.Write(ErrorMessages.InvalidBundle(this.fileExe));
+                this.Messaging.Write(BurnBackendErrors.InvalidBundle(this.fileExe));
                 return false;
             }
             else if (containerCount > 0)
@@ -314,7 +314,7 @@ namespace WixToolset.Core.Burn.Bundles
 
                 if (UInt32.MaxValue == wixburnSectionOffset)
                 {
-                    this.Messaging.Write(ErrorMessages.StubMissingWixburnSection(this.fileExe));
+                    this.Messaging.Write(BurnBackendErrors.StubMissingWixburnSection(this.fileExe));
                     return false;
                 }
 
@@ -324,7 +324,7 @@ namespace WixToolset.Core.Burn.Bundles
                 // the smallest alignment (512 bytes), but just to be paranoid...
                 if (BURN_SECTION_MIN_SIZE > this.wixburnRawDataSize)
                 {
-                    this.Messaging.Write(ErrorMessages.StubWixburnSectionTooSmall(this.fileExe));
+                    this.Messaging.Write(BurnBackendErrors.StubWixburnSectionTooSmall(this.fileExe));
                     return false;
                 }
 
@@ -354,7 +354,7 @@ namespace WixToolset.Core.Burn.Bundles
                 // Verify the NT signature...
                 if (IMAGE_NT_SIGNATURE != BurnCommon.ReadUInt32(bytes, IMAGE_NT_HEADER_OFFSET_SIGNATURE))
                 {
-                    this.Messaging.Write(ErrorMessages.InvalidStubExe(this.fileExe));
+                    this.Messaging.Write(BurnBackendErrors.InvalidStubExe(this.fileExe));
                     return false;
                 }
 
@@ -391,7 +391,7 @@ namespace WixToolset.Core.Burn.Bundles
                 // Verify the DOS 'MZ' signature.
                 if (IMAGE_DOS_SIGNATURE != BurnCommon.ReadUInt16(bytes, IMAGE_DOS_HEADER_OFFSET_MAGIC))
                 {
-                    this.Messaging.Write(ErrorMessages.InvalidStubExe(this.fileExe));
+                    this.Messaging.Write(BurnBackendErrors.InvalidStubExe(this.fileExe));
                     return false;
                 }
 
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
index c1dba91e..ebec667a 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/CreateBundleExeCommand.cs
@@ -61,7 +61,7 @@ namespace WixToolset.Core.Burn.Bundles
 
             if ("setup.exe".Equals(bundleFilename, StringComparison.OrdinalIgnoreCase))
             {
-                this.Messaging.Write(ErrorMessages.InsecureBundleFilename(bundleFilename));
+                this.Messaging.Write(BurnBackendErrors.InsecureBundleFilename(bundleFilename));
             }
 
             this.Transfer = this.BackendHelper.CreateFileTransfer(bundleTempPath, this.OutputPath, true, this.BundleSymbol.SourceLineNumbers);
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs
index 8b327b6a..564dbafb 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/GetPackageFacadesCommand.cs
@@ -60,8 +60,8 @@ namespace WixToolset.Core.Burn.Bundles
                             }
                             else
                             {
-                                this.Messaging.Write(ErrorMessages.PackagePayloadUnsupported(bundlePackagePayload.SourceLineNumbers, "Bundle"));
-                                this.Messaging.Write(ErrorMessages.PackagePayloadUnsupported2(package.SourceLineNumbers));
+                                this.Messaging.Write(BurnBackendErrors.PackagePayloadUnsupported(bundlePackagePayload.SourceLineNumbers, "Bundle"));
+                                this.Messaging.Write(BurnBackendErrors.PackagePayloadUnsupported2(package.SourceLineNumbers));
                             }
                         }
                         else if (exePackagePayloads.TryGetValue(wixGroup.ChildId, out var exePackagePayload))
@@ -72,8 +72,8 @@ namespace WixToolset.Core.Burn.Bundles
                             }
                             else
                             {
-                                this.Messaging.Write(ErrorMessages.PackagePayloadUnsupported(exePackagePayload.SourceLineNumbers, "Exe"));
-                                this.Messaging.Write(ErrorMessages.PackagePayloadUnsupported2(package.SourceLineNumbers));
+                                this.Messaging.Write(BurnBackendErrors.PackagePayloadUnsupported(exePackagePayload.SourceLineNumbers, "Exe"));
+                                this.Messaging.Write(BurnBackendErrors.PackagePayloadUnsupported2(package.SourceLineNumbers));
                             }
                         }
                         else if (msiPackagePayloads.TryGetValue(wixGroup.ChildId, out var msiPackagePayload))
@@ -84,8 +84,8 @@ namespace WixToolset.Core.Burn.Bundles
                             }
                             else
                             {
-                                this.Messaging.Write(ErrorMessages.PackagePayloadUnsupported(msiPackagePayload.SourceLineNumbers, "Msi"));
-                                this.Messaging.Write(ErrorMessages.PackagePayloadUnsupported2(package.SourceLineNumbers));
+                                this.Messaging.Write(BurnBackendErrors.PackagePayloadUnsupported(msiPackagePayload.SourceLineNumbers, "Msi"));
+                                this.Messaging.Write(BurnBackendErrors.PackagePayloadUnsupported2(package.SourceLineNumbers));
                             }
                         }
                         else if (mspPackagePayloads.TryGetValue(wixGroup.ChildId, out var mspPackagePayload))
@@ -96,8 +96,8 @@ namespace WixToolset.Core.Burn.Bundles
                             }
                             else
                             {
-                                this.Messaging.Write(ErrorMessages.PackagePayloadUnsupported(mspPackagePayload.SourceLineNumbers, "Msp"));
-                                this.Messaging.Write(ErrorMessages.PackagePayloadUnsupported2(package.SourceLineNumbers));
+                                this.Messaging.Write(BurnBackendErrors.PackagePayloadUnsupported(mspPackagePayload.SourceLineNumbers, "Msp"));
+                                this.Messaging.Write(BurnBackendErrors.PackagePayloadUnsupported2(package.SourceLineNumbers));
                             }
                         }
                         else if (msuPackagePayloads.TryGetValue(wixGroup.ChildId, out var msuPackagePayload))
@@ -108,8 +108,8 @@ namespace WixToolset.Core.Burn.Bundles
                             }
                             else
                             {
-                                this.Messaging.Write(ErrorMessages.PackagePayloadUnsupported(msuPackagePayload.SourceLineNumbers, "Msu"));
-                                this.Messaging.Write(ErrorMessages.PackagePayloadUnsupported2(package.SourceLineNumbers));
+                                this.Messaging.Write(BurnBackendErrors.PackagePayloadUnsupported(msuPackagePayload.SourceLineNumbers, "Msu"));
+                                this.Messaging.Write(BurnBackendErrors.PackagePayloadUnsupported2(package.SourceLineNumbers));
                             }
                         }
                         else
@@ -125,9 +125,9 @@ namespace WixToolset.Core.Burn.Bundles
                             }
                             else
                             {
-                                this.Messaging.Write(ErrorMessages.MultiplePackagePayloads(tempPackagePayload.SourceLineNumbers, id, packagePayload.Id.Id, tempPackagePayload.Id.Id));
-                                this.Messaging.Write(ErrorMessages.MultiplePackagePayloads2(packagePayload.SourceLineNumbers));
-                                this.Messaging.Write(ErrorMessages.MultiplePackagePayloads3(package.SourceLineNumbers));
+                                this.Messaging.Write(BurnBackendErrors.MultiplePackagePayloads(tempPackagePayload.SourceLineNumbers, id, packagePayload.Id.Id, tempPackagePayload.Id.Id));
+                                this.Messaging.Write(BurnBackendErrors.MultiplePackagePayloads2(packagePayload.SourceLineNumbers));
+                                this.Messaging.Write(BurnBackendErrors.MultiplePackagePayloads3(package.SourceLineNumbers));
                             }
                         }
                     }
@@ -135,7 +135,7 @@ namespace WixToolset.Core.Burn.Bundles
 
                 if (packagePayload == null)
                 {
-                    this.Messaging.Write(ErrorMessages.MissingPackagePayload(package.SourceLineNumbers, id, package.Type.ToString()));
+                    this.Messaging.Write(BurnBackendErrors.MissingPackagePayload(package.SourceLineNumbers, id, package.Type.ToString()));
                     continue;
                 }
                 else
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs
index 13aa60e3..18227ad7 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/OrderPackagesAndRollbackBoundariesCommand.cs
@@ -80,8 +80,8 @@ namespace WixToolset.Core.Burn.Bundles
                         {
                             if (facade.PackageSymbol.Type != WixBundlePackageType.Msi && facade.PackageSymbol.Type != WixBundlePackageType.Msp)
                             {
-                                this.Messaging.Write(ErrorMessages.MsiTransactionInvalidPackage(facade.PackageSymbol.SourceLineNumbers, facade.PackageId, facade.PackageSymbol.Type.ToString()));
-                                this.Messaging.Write(ErrorMessages.MsiTransactionInvalidPackage2(lastRollbackBoundary.SourceLineNumbers));
+                                this.Messaging.Write(BurnBackendErrors.MsiTransactionInvalidPackage(facade.PackageSymbol.SourceLineNumbers, facade.PackageId, facade.PackageSymbol.Type.ToString()));
+                                this.Messaging.Write(BurnBackendErrors.MsiTransactionInvalidPackage2(lastRollbackBoundary.SourceLineNumbers));
                             }
                             // Not possible to tell the bitness of Msp.
                             else if (facade.PackageSymbol.Type == WixBundlePackageType.Msi)
@@ -93,8 +93,8 @@ namespace WixToolset.Core.Burn.Bundles
                                 // Error if MSI transaction has x86 package preceding x64 packages
                                 else if (msiTransactionX86Package != null && facade.PackageSymbol.Win64)
                                 {
-                                    this.Messaging.Write(ErrorMessages.MsiTransactionX86BeforeX64Package(facade.PackageSymbol.SourceLineNumbers, facade.PackageId, msiTransactionX86Package.PackageId));
-                                    this.Messaging.Write(ErrorMessages.MsiTransactionX86BeforeX64Package2(msiTransactionX86Package.PackageSymbol.SourceLineNumbers));
+                                    this.Messaging.Write(BurnBackendErrors.MsiTransactionX86BeforeX64Package(facade.PackageSymbol.SourceLineNumbers, facade.PackageId, msiTransactionX86Package.PackageId));
+                                    this.Messaging.Write(BurnBackendErrors.MsiTransactionX86BeforeX64Package2(msiTransactionX86Package.PackageSymbol.SourceLineNumbers));
                                 }
                             }
                         }
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs
index 60f375e5..7fd91900 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/OrderSearchesCommand.cs
@@ -109,7 +109,7 @@ namespace WixToolset.Core.Burn.Bundles
                     // We will show a separate message for every ID that's in
                     // the loop. We could bail after the first one, but then
                     // we wouldn't catch disjoint loops in a single run.
-                    this.Messaging.Write(ErrorMessages.CircularSearchReference(chain));
+                    this.Messaging.Write(BurnBackendErrors.CircularSearchReference(chain));
                 }
             }
         }
@@ -357,7 +357,7 @@ namespace WixToolset.Core.Burn.Bundles
                 }
                 else
                 {
-                    this.Messaging.Write(ErrorMessages.MissingBundleSearch(searchSymbol.SourceLineNumbers, searchId));
+                    this.Messaging.Write(BurnBackendErrors.MissingBundleSearch(searchSymbol.SourceLineNumbers, searchId));
                 }
             }
 
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
index 0b78c545..783c9f6b 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs
@@ -223,7 +223,7 @@ namespace WixToolset.Core.Burn.Bundles
             }
             catch (MsiException e)
             {
-                this.Messaging.Write(ErrorMessages.UnableToReadPackageInformation(this.PackagePayload.SourceLineNumbers, sourcePath, e.Message));
+                this.Messaging.Write(BurnBackendErrors.UnableToReadPackageInformation(this.PackagePayload.SourceLineNumbers, sourcePath, e.Message));
                 return null;
             }
 
@@ -316,7 +316,7 @@ namespace WixToolset.Core.Burn.Bundles
                 {
                     if (!perMachine)
                     {
-                        this.Messaging.Write(ErrorMessages.PerUserButAllUsersEquals1(this.ChainPackage.SourceLineNumbers, this.PackageId));
+                        this.Messaging.Write(BurnBackendErrors.PerUserButAllUsersEquals1(this.ChainPackage.SourceLineNumbers, this.PackageId));
                     }
                 }
                 else if (allusers.Equals("2", StringComparison.Ordinal))
@@ -325,7 +325,7 @@ namespace WixToolset.Core.Burn.Bundles
                 }
                 else
                 {
-                    this.Messaging.Write(ErrorMessages.UnsupportedAllUsersValue(this.ChainPackage.SourceLineNumbers, this.PackageId, allusers));
+                    this.Messaging.Write(BurnBackendErrors.UnsupportedAllUsersValue(this.ChainPackage.SourceLineNumbers, this.PackageId, allusers));
                 }
             }
         }
diff --git a/src/wix/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs b/src/wix/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs
index 8d1e9c39..4aee311e 100644
--- a/src/wix/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs
+++ b/src/wix/WixToolset.Core.Burn/Bundles/ProcessMspPackageCommand.cs
@@ -119,7 +119,7 @@ namespace WixToolset.Core.Burn.Bundles
             }
             catch (MsiException e)
             {
-                this.Messaging.Write(ErrorMessages.UnableToReadPackageInformation(this.PackagePayload.SourceLineNumbers, sourcePath, e.Message));
+                this.Messaging.Write(BurnBackendErrors.UnableToReadPackageInformation(this.PackagePayload.SourceLineNumbers, sourcePath, e.Message));
                 return null;
             }
 
diff --git a/src/wix/WixToolset.Core.Burn/BurnBackendErrors.cs b/src/wix/WixToolset.Core.Burn/BurnBackendErrors.cs
index 2daf376f..45fba11a 100644
--- a/src/wix/WixToolset.Core.Burn/BurnBackendErrors.cs
+++ b/src/wix/WixToolset.Core.Burn/BurnBackendErrors.cs
@@ -118,6 +118,121 @@ namespace WixToolset.Core.Burn
             return Message(sourceLineNumbers, Ids.BundleMissingBootstrapperApplicationContainer, "Bundle is invalid. The BootstrapperApplication attached container is missing from the file: {0}", path);
         }
 
+        public static Message CircularSearchReference(string chain)
+        {
+            return Message(null, Ids.CircularSearchReference, "A circular reference of search ordering constraints was detected: {0}. Search ordering references must form a directed acyclic graph.", chain);
+        }
+
+        public static Message DuplicateProviderDependencyKey(string providerKey, string packageId)
+        {
+            return Message(null, Ids.DuplicateProviderDependencyKey, "The provider dependency key '{0}' was already imported from the package with Id '{1}'. Please remove the Provides element with the key '{0}' from the package authoring.", providerKey, packageId);
+        }
+
+        public static Message InsecureBundleFilename(string filename)
+        {
+            return Message(null, Ids.InsecureBundleFilename, "The file name '{0}' creates an insecure bundle. Windows will load unnecessary compatibility shims into a bundle with that file name. These compatibility shims can be DLL hijacked allowing attackers to compromise your customers' computer. Choose a different bundle file name.", filename);
+        }
+
+        public static Message InvalidBundle(string bundleExecutable)
+        {
+            return Message(null, Ids.InvalidBundle, "Unable to read bundle executable '{0}'. This is not a valid WiX bundle.", bundleExecutable);
+        }
+
+        public static Message InvalidStubExe(string filename)
+        {
+            return Message(null, Ids.InvalidStubExe, "Stub executable '{0}' is not a valid Win32 executable.", filename);
+        }
+
+        public static Message MissingBundleInformation(string friendlyName)
+        {
+            return Message(null, Ids.MissingBundleInformation, "The Bundle is missing {0} data, and cannot continue.", friendlyName);
+        }
+
+        public static Message MissingBundleSearch(SourceLineNumber sourceLineNumbers, string searchId)
+        {
+            return Message(sourceLineNumbers, Ids.MissingBundleSearch, "Bundle Search with id '{0}' has no corresponding implementation symbol.", searchId);
+        }
+
+        public static Message MissingDependencyVersion(string packageId)
+        {
+            return Message(null, Ids.MissingDependencyVersion, "The provider dependency version was not authored for the package with Id '{0}'. Please author the Provides/@Version attribute for this package.", packageId);
+        }
+
+        public static Message MissingPackagePayload(SourceLineNumber sourceLineNumbers, string packageId, string packageType)
+        {
+            return Message(sourceLineNumbers, Ids.MissingPackagePayload, "There is no payload defined for package '{0}'. This is specified on the {1}Package element or a child {1}PackagePayload element.", packageId, packageType);
+        }
+
+        public static Message MsiTransactionInvalidPackage(SourceLineNumber sourceLineNumbers, string packageId, string packageType)
+        {
+            return Message(sourceLineNumbers, Ids.MsiTransactionInvalidPackage, "Invalid package '{0}' in MSI transaction. It is type '{1}' but must be Msi or Msp.", packageId, packageType);
+        }
+
+        public static Message MsiTransactionInvalidPackage2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.MsiTransactionInvalidPackage2, "Location of rollback boundary related to previous error.");
+        }
+
+        public static Message MsiTransactionX86BeforeX64Package(SourceLineNumber sourceLineNumbers, string x64PackageId, string x86PackageId)
+        {
+            return Message(sourceLineNumbers, Ids.MsiTransactionX86BeforeX64Package, "Package '{0}' is x64 but Package '{1}' is x86. MSI transactions must install all x64 packages before any x86 package.", x64PackageId, x86PackageId);
+        }
+
+        public static Message MsiTransactionX86BeforeX64Package2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.MsiTransactionX86BeforeX64Package2, "Location of x86 package related to previous error.");
+        }
+
+        public static Message MultiplePackagePayloads(SourceLineNumber sourceLineNumbers, string packageId, string packagePayloadId1, string packagePayloadId2)
+        {
+            return Message(sourceLineNumbers, Ids.MultiplePackagePayloads, "The package '{0}' has multiple PackagePayloads: '{1}' and '{2}'. This normally happens when the payload is defined on the package element and a child PackagePayload element.", packageId, packagePayloadId1, packagePayloadId2);
+        }
+
+        public static Message MultiplePackagePayloads2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.MultiplePackagePayloads2, "The location of the package payload related to previous error.");
+        }
+
+        public static Message MultiplePackagePayloads3(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.MultiplePackagePayloads3, "The location of the package related to previous error.");
+        }
+
+        public static Message PackagePayloadUnsupported(SourceLineNumber sourceLineNumbers, string packageType)
+        {
+            return Message(sourceLineNumbers, Ids.PackagePayloadUnsupported, "The {0}PackagePayload element can only be used for {0}Packages.", packageType);
+        }
+
+        public static Message PackagePayloadUnsupported2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.PackagePayloadUnsupported2, "The location of the package related to previous error.");
+        }
+
+        public static Message PerUserButAllUsersEquals1(SourceLineNumber sourceLineNumbers, string path)
+        {
+            return Message(sourceLineNumbers, Ids.PerUserButAllUsersEquals1, "The MSI '{0}' is explicitly marked to not elevate so it must be a per-user package but the ALLUSERS Property is set to '1' creating a per-machine package. Remove the Property with Id='ALLUSERS' and use Package/@Scope attribute to be explicit instead.", path);
+        }
+
+        public static Message StubMissingWixburnSection(string filename)
+        {
+            return Message(null, Ids.StubMissingWixburnSection, "Stub executable '{0}' does not contain a .wixburn data section.", filename);
+        }
+
+        public static Message StubWixburnSectionTooSmall(string filename)
+        {
+            return Message(null, Ids.StubWixburnSectionTooSmall, "Stub executable '{0}' .wixburn data section is too small to store the Burn container header.", filename);
+        }
+
+        public static Message UnableToReadPackageInformation(SourceLineNumber sourceLineNumbers, string packagePath, string detailedErrorMessage)
+        {
+            return Message(sourceLineNumbers, Ids.UnableToReadPackageInformation, "Unable to read package '{0}'. {1}", packagePath, detailedErrorMessage);
+        }
+
+        public static Message UnsupportedAllUsersValue(SourceLineNumber sourceLineNumbers, string path, string value)
+        {
+            return Message(sourceLineNumbers, Ids.UnsupportedAllUsersValue, "The MSI '{0}' set the ALLUSERS Property to '{0}' which is not supported. Remove the Property with Id='ALLUSERS' and use Package/@Scope attribute instead.", path, value);
+        }
+
         private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
         {
             return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args);
@@ -125,6 +240,29 @@ namespace WixToolset.Core.Burn
 
         public enum Ids
         {
+            InvalidStubExe = 338,
+            StubMissingWixburnSection = 339,
+            StubWixburnSectionTooSmall = 340,
+            MissingBundleInformation = 341,
+            UnableToReadPackageInformation = 352,
+            InvalidBundle = 354,
+            PerUserButAllUsersEquals1 = 363,
+            UnsupportedAllUsersValue = 364,
+            DuplicateProviderDependencyKey = 370,
+            MissingDependencyVersion = 371,
+            InsecureBundleFilename = 388,
+            MsiTransactionX86BeforeX64Package = 390,
+            MissingBundleSearch = 397,
+            CircularSearchReference = 398,
+            PackagePayloadUnsupported = 402,
+            PackagePayloadUnsupported2 = 403,
+            MultiplePackagePayloads = 404,
+            MultiplePackagePayloads2 = 405,
+            MultiplePackagePayloads3 = 406,
+            MissingPackagePayload = 407,
+            MsiTransactionX86BeforeX64Package2 = 410,
+            MsiTransactionInvalidPackage = 411,
+            MsiTransactionInvalidPackage2 = 412,
             DuplicateCacheIds = 8000,
             DuplicateCacheIds2 = 8001,
             BAContainerPayloadCollision = 8002,
diff --git a/src/wix/WixToolset.Core.Native/Msm/IMsmErrors.cs b/src/wix/WixToolset.Core.Native/Msm/IMsmErrors.cs
index e1472376..a637ef07 100644
--- a/src/wix/WixToolset.Core.Native/Msm/IMsmErrors.cs
+++ b/src/wix/WixToolset.Core.Native/Msm/IMsmErrors.cs
@@ -1,4 +1,4 @@
-// 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.
+// 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.Msm
 {
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/AssemblyNameReader.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/AssemblyNameReader.cs
index 838a6fe1..20aa2dd1 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/AssemblyNameReader.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/AssemblyNameReader.cs
@@ -56,7 +56,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
             catch (Exception e) when (e is FileNotFoundException || e is BadImageFormatException || e is InvalidOperationException)
             {
-                throw new WixException(ErrorMessages.InvalidAssemblyFile(sourceLineNumbers, assemblyPath, $"{e.GetType().Name}: {e.Message}"));
+                throw new WixException(WindowsInstallerBackendErrors.InvalidAssemblyFile(sourceLineNumbers, assemblyPath, $"{e.GetType().Name}: {e.Message}"));
             }
         }
 
@@ -97,7 +97,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
                         if (!hasNextSibling)
                         {
-                            throw new WixException(ErrorMessages.InvalidManifestContent(sourceLineNumbers, manifestPath));
+                            throw new WixException(WindowsInstallerBackendErrors.InvalidManifestContent(sourceLineNumbers, manifestPath));
                         }
 
                         if (nav.MoveToAttribute("type", String.Empty))
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs
index 975a4cef..5a56e0d9 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/AssignMediaCommand.cs
@@ -56,7 +56,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             // If both symbols are authored, it is an error.
             if (mediaTemplateSymbols.Count > 0 && mediaSymbols.Count > 1)
             {
-                throw new WixException(ErrorMessages.MediaTableCollision(null));
+                throw new WixException(WindowsInstallerBackendErrors.MediaTableCollision(null));
             }
 
             // If neither symbol is authored, default to a media template.
@@ -157,7 +157,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
             catch (OverflowException)
             {
-                throw new WixException(ErrorMessages.MaximumUncompressedMediaSizeTooLarge(null, maxPreCabSizeInMB));
+                throw new WixException(WindowsInstallerBackendErrors.MaximumUncompressedMediaSizeTooLarge(null, maxPreCabSizeInMB));
             }
 
             var mediaSymbolsByDiskId = new Dictionary<int, MediaSymbol>();
@@ -238,8 +238,8 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     {
                         if (cabinetMediaSymbols.TryGetValue(mediaSymbol.Cabinet, out var existingRow))
                         {
-                            this.Messaging.Write(ErrorMessages.DuplicateCabinetName(mediaSymbol.SourceLineNumbers, mediaSymbol.Cabinet));
-                            this.Messaging.Write(ErrorMessages.DuplicateCabinetName2(existingRow.SourceLineNumbers, existingRow.Cabinet));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.DuplicateCabinetName(mediaSymbol.SourceLineNumbers, mediaSymbol.Cabinet));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.DuplicateCabinetName2(existingRow.SourceLineNumbers, existingRow.Cabinet));
                         }
                         else
                         {
@@ -257,7 +257,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             {
                 if (!mediaSymbolsByDiskId.TryGetValue(facade.DiskId, out var mediaSymbol))
                 {
-                    this.Messaging.Write(ErrorMessages.MissingMedia(facade.SourceLineNumber, facade.DiskId));
+                    this.Messaging.Write(WindowsInstallerBackendErrors.MissingMedia(facade.SourceLineNumber, facade.DiskId));
                     continue;
                 }
 
@@ -277,7 +277,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     }
                     else
                     {
-                        this.Messaging.Write(ErrorMessages.ExpectedMediaCabinet(facade.SourceLineNumber, facade.Id, facade.DiskId));
+                        this.Messaging.Write(WindowsInstallerBackendErrors.ExpectedMediaCabinet(facade.SourceLineNumber, facade.Id, facade.DiskId));
                     }
                 }
             }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
index 5c05bdea..ad0b2425 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs
@@ -135,7 +135,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
         {
             if (!this.Intermediate.HasLevel(Data.IntermediateLevels.Linked) || !this.Intermediate.HasLevel(Data.IntermediateLevels.Resolved))
             {
-                this.Messaging.Write(ErrorMessages.IntermediatesMustBeResolved(this.Intermediate.Id));
+                this.Messaging.Write(WindowsInstallerBackendErrors.IntermediatesMustBeResolved(this.Intermediate.Id));
             }
 
             var section = this.Intermediate.Sections.Single();
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs
index f327081a..cf2a772a 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/BindTransformCommand.cs
@@ -217,7 +217,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             if (((int)TransformFlags.ValidateUpgradeCode & transformFlags) != 0 &&
                 (String.IsNullOrEmpty(targetUpgradeCode) || String.IsNullOrEmpty(updatedUpgradeCode)))
             {
-                this.Messaging.Write(ErrorMessages.BothUpgradeCodesRequired());
+                this.Messaging.Write(WindowsInstallerBackendErrors.BothUpgradeCodesRequired());
             }
 
             string emptyFile = null;
@@ -297,7 +297,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                             {
                                 if (RowOperation.Add == fileRow.Operation)
                                 {
-                                    this.Messaging.Write(ErrorMessages.InvalidAddedFileRowWithoutSequence(fileRow.SourceLineNumbers, (string)fileRow[0]));
+                                    this.Messaging.Write(WindowsInstallerBackendErrors.InvalidAddedFileRowWithoutSequence(fileRow.SourceLineNumbers, (string)fileRow[0]));
                                     break;
                                 }
 
@@ -427,7 +427,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     }
                     else
                     {
-                        this.Messaging.Write(ErrorMessages.NoDifferencesInTransform(this.Transform.SourceLineNumbers));
+                        this.Messaging.Write(WindowsInstallerBackendErrors.NoDifferencesInTransform(this.Transform.SourceLineNumbers));
                     }
                 }
             }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CabinetBuilder.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CabinetBuilder.cs
index cc052510..9385d486 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CabinetBuilder.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CabinetBuilder.cs
@@ -215,10 +215,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 switch (win32Exception.NativeErrorCode)
                 {
                     case 0x4005:
-                        this.Messaging.Write(ErrorMessages.CreateCabAddFileFailed());
+                        this.Messaging.Write(WindowsInstallerBackendErrors.CreateCabAddFileFailed());
                         return null;
                     case 0x0070:
-                        this.Messaging.Write(ErrorMessages.CreateCabInsufficientDiskSpace());
+                        this.Messaging.Write(WindowsInstallerBackendErrors.CreateCabInsufficientDiskSpace());
                         return null;
                     default:
                         throw;
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
index e4815572..acfaa793 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs
@@ -217,7 +217,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 }
                 catch (OverflowException)
                 {
-                    throw new WixException(ErrorMessages.MaximumCabinetSizeForLargeFileSplittingTooLarge(null, maxCabSizeForLargeFileInMB, MaxValueOfMaxCabSizeForLargeFileSplitting));
+                    throw new WixException(WindowsInstallerBackendErrors.MaximumCabinetSizeForLargeFileSplittingTooLarge(null, maxCabSizeForLargeFileInMB, MaxValueOfMaxCabSizeForLargeFileSplitting));
                 }
 
                 var maxPreCompressedSizeInMB = 0;
@@ -235,7 +235,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 }
                 catch (OverflowException)
                 {
-                    throw new WixException(ErrorMessages.MaximumUncompressedMediaSizeTooLarge(null, maxPreCompressedSizeInMB));
+                    throw new WixException(WindowsInstallerBackendErrors.MaximumUncompressedMediaSizeTooLarge(null, maxPreCompressedSizeInMB));
                 }
             }
             else
@@ -271,7 +271,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 if (!fileTransfersByName.TryGetValue(cabinet.CabinetName, out var transfer) ||
                     !mediaRowsByOriginalDiskId.TryGetValue(completedCabinetSpanned.DiskId, out var mediaRow))
                 {
-                    throw new WixException(ErrorMessages.SplitCabinetCopyRegistrationFailed(spannedCabinets.First().CabinetName, cabinet.CabinetName));
+                    throw new WixException(WindowsInstallerBackendErrors.SplitCabinetCopyRegistrationFailed(spannedCabinets.First().CabinetName, cabinet.CabinetName));
                 }
 
                 var lastDiskId = mediaRow.DiskId;
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs
index 28bcfd4a..32729db2 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateIdtFileCommand.cs
@@ -55,7 +55,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             if (TableDefinition.MaxColumnsInRealTable < table.Definition.Columns.Length)
             {
-                throw new WixException(ErrorMessages.TooManyColumnsInRealTable(table.Definition.Name, table.Definition.Columns.Length, TableDefinition.MaxColumnsInRealTable));
+                throw new WixException(WindowsInstallerBackendErrors.TooManyColumnsInRealTable(table.Definition.Name, table.Definition.Columns.Length, TableDefinition.MaxColumnsInRealTable));
             }
 
             // Tack on the table header, and flush before we start writing bytes directly to the stream.
@@ -81,7 +81,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     }
                     catch (EncoderFallbackException)
                     {
-                        this.Messaging.Write(ErrorMessages.InvalidStringForCodepage(row.SourceLineNumbers, Convert.ToString(writer.Encoding.CodePage, CultureInfo.InvariantCulture)));
+                        this.Messaging.Write(WindowsInstallerBackendErrors.InvalidStringForCodepage(row.SourceLineNumbers, Convert.ToString(writer.Encoding.CodePage, CultureInfo.InvariantCulture)));
 
                         rowBytes = convertEncoding.GetBytes(rowString);
                     }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreatePatchSubStoragesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreatePatchSubStoragesCommand.cs
index db121137..8b77a8bc 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreatePatchSubStoragesCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreatePatchSubStoragesCommand.cs
@@ -80,7 +80,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             if (this.Transforms == null || !this.Transforms.Any())
             {
-                this.Messaging.Write(ErrorMessages.PatchWithoutTransforms());
+                this.Messaging.Write(WindowsInstallerBackendErrors.PatchWithoutTransforms());
                 return subStorages;
             }
 
@@ -95,13 +95,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             if (String.IsNullOrEmpty(patchSymbol.Id?.Id))
             {
-                this.Messaging.Write(ErrorMessages.ExpectedPatchIdInWixMsp());
+                this.Messaging.Write(WindowsInstallerBackendErrors.ExpectedPatchIdInWixMsp());
                 return subStorages;
             }
 
             if (String.IsNullOrEmpty(patchSymbol.ClientPatchId))
             {
-                this.Messaging.Write(ErrorMessages.ExpectedClientPatchIdInWixMsp());
+                this.Messaging.Write(WindowsInstallerBackendErrors.ExpectedClientPatchIdInWixMsp());
                 return subStorages;
             }
 
@@ -110,7 +110,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             if (patchMediaByDiskId.Count == 0)
             {
-                this.Messaging.Write(ErrorMessages.ExpectedMediaRowsInWixMsp());
+                this.Messaging.Write(WindowsInstallerBackendErrors.ExpectedMediaRowsInWixMsp());
                 return subStorages;
             }
 
@@ -186,7 +186,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             if (validTransform.Count == 0)
             {
-                this.Messaging.Write(ErrorMessages.PatchWithoutValidTransforms());
+                this.Messaging.Write(WindowsInstallerBackendErrors.PatchWithoutValidTransforms());
                 return subStorages;
             }
 
@@ -202,7 +202,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
                 if (!uninstallable)
                 {
-                    this.Messaging.Write(ErrorMessages.PatchNotRemovable());
+                    this.Messaging.Write(WindowsInstallerBackendErrors.PatchNotRemovable());
                     return subStorages;
                 }
             }
@@ -364,7 +364,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
                         var primaryKey = row.GetPrimaryKey('/') ?? String.Empty;
 
-                        this.Messaging.Write(ErrorMessages.NewRowAddedInTable(row.SourceLineNumbers, productCode, table.Name, primaryKey));
+                        this.Messaging.Write(WindowsInstallerBackendErrors.NewRowAddedInTable(row.SourceLineNumbers, productCode, table.Name, primaryKey));
                     }
                 }
             }
@@ -432,7 +432,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     // If the keypath is modified its an error
                     if (row.Fields[5].Modified)
                     {
-                        this.Messaging.Write(ErrorMessages.InvalidKeypathChange(row.SourceLineNumbers, id, transformPath));
+                        this.Messaging.Write(WindowsInstallerBackendErrors.InvalidKeypathChange(row.SourceLineNumbers, id, transformPath));
                     }
                 }
             }
@@ -457,7 +457,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         if (row.Fields[2].Modified)
                         {
                             // You can't change the filename of a file that is the keypath of a component.
-                            this.Messaging.Write(ErrorMessages.InvalidKeypathChange(row.SourceLineNumbers, componentId, transformPath));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.InvalidKeypathChange(row.SourceLineNumbers, componentId, transformPath));
                         }
 
                         if (!componentWithChangedKeyPath.ContainsKey(componentId))
@@ -546,7 +546,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                             if (!featureOps.TryGetValue(featureId, out var op) || op != RowOperation.Delete)
                             {
                                 // The feature was not deleted.
-                                this.Messaging.Write(ErrorMessages.InvalidRemoveComponent(((Row)entry.Value).SourceLineNumbers, entry.Key.ToString(), featureId, transformPath));
+                                this.Messaging.Write(WindowsInstallerBackendErrors.InvalidRemoveComponent(((Row)entry.Value).SourceLineNumbers, entry.Key.ToString(), featureId, transformPath));
                             }
                         }
                     }
@@ -639,7 +639,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
             if (productCode == null)
             {
-                this.Messaging.Write(ErrorMessages.CouldNotDetermineProductCodeFromTransformSummaryInfo());
+                this.Messaging.Write(WindowsInstallerBackendErrors.CouldNotDetermineProductCodeFromTransformSummaryInfo());
                 return null;
             }
 
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
index 1665ced3..e565bbb5 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/CreateWindowsInstallerDataFromIRCommand.cs
@@ -1227,7 +1227,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     }
                     else
                     {
-                        this.Messaging.Write(ErrorMessages.UnexpectedCustomTableColumn(cell.SourceLineNumbers, cell.ColumnRef));
+                        this.Messaging.Write(WindowsInstallerBackendErrors.UnexpectedCustomTableColumn(cell.SourceLineNumbers, cell.ColumnRef));
                     }
                 }
 
@@ -1235,7 +1235,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 {
                     if (!customTableDefinition.Columns[i].Nullable && (null == customRow.Fields[i].Data || 0 == customRow.Fields[i].Data.ToString().Length))
                     {
-                        this.Messaging.Write(ErrorMessages.NoDataForColumn(firstCellSymbol.SourceLineNumbers, customTableDefinition.Columns[i].Name, customTableDefinition.Name));
+                        this.Messaging.Write(WindowsInstallerBackendErrors.NoDataForColumn(firstCellSymbol.SourceLineNumbers, customTableDefinition.Columns[i].Name, customTableDefinition.Name));
                     }
                 }
             }
@@ -1423,7 +1423,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         {
                             foreach (var row in table.Rows)
                             {
-                                this.Messaging.Write(ErrorMessages.UnexpectedTableInMergeModule(row.SourceLineNumbers, table.Name));
+                                this.Messaging.Write(WindowsInstallerBackendErrors.UnexpectedTableInMergeModule(row.SourceLineNumbers, table.Name));
                             }
                         }
                         else if ("Error" == table.Name)
@@ -1437,7 +1437,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         {
                             foreach (var row in table.Rows)
                             {
-                                this.Messaging.Write(ErrorMessages.OverlengthTableNameInProductOrMergeModule(row.SourceLineNumbers, table.Name));
+                                this.Messaging.Write(WindowsInstallerBackendErrors.OverlengthTableNameInProductOrMergeModule(row.SourceLineNumbers, table.Name));
                             }
                         }
                         break;
@@ -1452,7 +1452,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         {
                             foreach (var row in table.Rows)
                             {
-                                this.Messaging.Write(ErrorMessages.UnexpectedTableInPatch(row.SourceLineNumbers, table.Name));
+                                this.Messaging.Write(WindowsInstallerBackendErrors.UnexpectedTableInPatch(row.SourceLineNumbers, table.Name));
                             }
                         }
                         break;
@@ -1481,7 +1481,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         {
                             foreach (var row in table.Rows)
                             {
-                                this.Messaging.Write(ErrorMessages.OverlengthTableNameInProductOrMergeModule(row.SourceLineNumbers, table.Name));
+                                this.Messaging.Write(WindowsInstallerBackendErrors.OverlengthTableNameInProductOrMergeModule(row.SourceLineNumbers, table.Name));
                             }
                         }
                         break;
@@ -1504,7 +1504,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
                             if (keyColumnIndex <= 0 || keyColumnIndex > keyTableDefinition.Columns.Length)
                             {
-                                this.Messaging.Write(ErrorMessages.InvalidKeyColumn(tableDefinition.Name, columnDefinition.Name, columnDefinition.KeyTable, keyColumnIndex));
+                                this.Messaging.Write(WindowsInstallerBackendErrors.InvalidKeyColumn(tableDefinition.Name, columnDefinition.Name, columnDefinition.KeyTable, keyColumnIndex));
                             }
                             else if (keyTableDefinition.Columns[keyColumnIndex - 1].ModularizeType != columnDefinition.ModularizeType && ColumnModularizeType.CompanionFile != columnDefinition.ModularizeType)
                             {
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
index 117923e5..5e360329 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ExtractMergeModuleFilesCommand.cs
@@ -120,11 +120,11 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                                 // If case-sensitive collision with another merge module or a user-authored file identifier.
                                 if (indexedFileFacades.TryGetValue(mergeModuleFileFacade.Id, out var collidingFacade))
                                 {
-                                    this.Messaging.Write(ErrorMessages.DuplicateModuleFileIdentifier(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, collidingFacade.Id));
+                                    this.Messaging.Write(WindowsInstallerBackendErrors.DuplicateModuleFileIdentifier(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, collidingFacade.Id));
                                 }
                                 else if (uniqueModuleFileIdentifiers.TryGetValue(mergeModuleFileFacade.Id, out collidingFacade)) // case-insensitive collision with another file identifier in the same merge module
                                 {
-                                    this.Messaging.Write(ErrorMessages.DuplicateModuleCaseInsensitiveFileIdentifier(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, mergeModuleFileFacade.Id, collidingFacade.Id));
+                                    this.Messaging.Write(WindowsInstallerBackendErrors.DuplicateModuleCaseInsensitiveFileIdentifier(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, mergeModuleFileFacade.Id, collidingFacade.Id));
                                 }
                                 else // no collision
                                 {
@@ -156,7 +156,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         }
                         catch (FormatException)
                         {
-                            throw new WixException(ErrorMessages.MissingOrInvalidModuleInstallerVersion(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, wixMergeRow.SourceFile, moduleInstallerVersionString));
+                            throw new WixException(WindowsInstallerBackendErrors.MissingOrInvalidModuleInstallerVersion(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, wixMergeRow.SourceFile, moduleInstallerVersionString));
                         }
                     }
                 }
@@ -167,7 +167,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
             catch (Win32Exception)
             {
-                throw new WixException(ErrorMessages.CannotOpenMergeModule(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, wixMergeRow.SourceFile));
+                throw new WixException(WindowsInstallerBackendErrors.CannotOpenMergeModule(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, wixMergeRow.SourceFile));
             }
 
             return trackedFiles;
@@ -186,7 +186,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
             catch (FormatException)
             {
-                this.Messaging.Write(ErrorMessages.InvalidMergeLanguage(wixMergeRow.SourceLineNumbers, mergeId, wixMergeRow.Language.ToString()));
+                this.Messaging.Write(WindowsInstallerBackendErrors.InvalidMergeLanguage(wixMergeRow.SourceLineNumbers, mergeId, wixMergeRow.Language.ToString()));
                 return;
             }
 
@@ -209,16 +209,16 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 }
                 catch (FileNotFoundException)
                 {
-                    throw new WixException(ErrorMessages.CabFileDoesNotExist(moduleCabPath, wixMergeRow.SourceFile, mergeIdPath));
+                    throw new WixException(WindowsInstallerBackendErrors.CabFileDoesNotExist(moduleCabPath, wixMergeRow.SourceFile, mergeIdPath));
                 }
                 catch
                 {
-                    throw new WixException(ErrorMessages.CabExtractionFailed(moduleCabPath, wixMergeRow.SourceFile, mergeIdPath));
+                    throw new WixException(WindowsInstallerBackendErrors.CabExtractionFailed(moduleCabPath, wixMergeRow.SourceFile, mergeIdPath));
                 }
             }
             catch (COMException ce)
             {
-                throw new WixException(ErrorMessages.UnableToOpenModule(wixMergeRow.SourceLineNumbers, wixMergeRow.SourceFile, ce.Message));
+                throw new WixException(WindowsInstallerBackendErrors.UnableToOpenModule(wixMergeRow.SourceLineNumbers, wixMergeRow.SourceFile, ce.Message));
             }
             finally
             {
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/FinalizeComponentGuids.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/FinalizeComponentGuids.cs
index fe6e322c..180ab3d6 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/FinalizeComponentGuids.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/FinalizeComponentGuids.cs
@@ -156,13 +156,13 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                             path.StartsWith(@"StartMenuFolder\programs", StringComparison.Ordinal) ||
                             path.StartsWith(@"WindowsFolder\fonts", StringComparison.Ordinal))
                         {
-                            this.Messaging.Write(ErrorMessages.IllegalPathForGeneratedComponentGuid(componentSymbol.SourceLineNumbers, fileSymbol.ComponentRef, path));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.IllegalPathForGeneratedComponentGuid(componentSymbol.SourceLineNumbers, fileSymbol.ComponentRef, path));
                         }
 
                         // if component has more than one file, the key path must be versioned
                         if (1 < numFilesInComponent && String.IsNullOrEmpty(fileSymbol.Version))
                         {
-                            this.Messaging.Write(ErrorMessages.IllegalGeneratedGuidComponentUnversionedKeypath(componentSymbol.SourceLineNumbers));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.IllegalGeneratedGuidComponentUnversionedKeypath(componentSymbol.SourceLineNumbers));
                         }
                     }
                     else
@@ -170,7 +170,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         // not a key path, so it must be an unversioned file if component has more than one file
                         if (1 < numFilesInComponent && !String.IsNullOrEmpty(fileSymbol.Version))
                         {
-                            this.Messaging.Write(ErrorMessages.IllegalGeneratedGuidComponentVersionedNonkeypath(componentSymbol.SourceLineNumbers));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.IllegalGeneratedGuidComponentVersionedNonkeypath(componentSymbol.SourceLineNumbers));
                         }
                     }
                 }
@@ -234,7 +234,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     }
                     else
                     {
-                        this.Messaging.Write(ErrorMessages.DuplicateComponentGuids(componentSymbol.SourceLineNumbers, componentSymbol.Id.Id, componentSymbol.ComponentId, type, path));
+                        this.Messaging.Write(WindowsInstallerBackendErrors.DuplicateComponentGuids(componentSymbol.SourceLineNumbers, componentSymbol.Id.Id, componentSymbol.ComponentId, type, path));
                     }
                 }
             }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs
index 4efc6a11..33ac6f69 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/GenerateTransformCommand.cs
@@ -69,17 +69,17 @@ namespace WixToolset.Core.WindowsInstaller
             // Compare the codepages.
             if (targetOutput.Codepage != updatedOutput.Codepage && 0 == (TransformFlags.ErrorChangeCodePage & validationFlags))
             {
-                this.messaging.Write(ErrorMessages.OutputCodepageMismatch(targetOutput.SourceLineNumbers, targetOutput.Codepage, updatedOutput.Codepage));
+                this.messaging.Write(WindowsInstallerBackendErrors.OutputCodepageMismatch(targetOutput.SourceLineNumbers, targetOutput.Codepage, updatedOutput.Codepage));
                 if (null != updatedOutput.SourceLineNumbers)
                 {
-                    this.messaging.Write(ErrorMessages.OutputCodepageMismatch2(updatedOutput.SourceLineNumbers));
+                    this.messaging.Write(WindowsInstallerBackendErrors.OutputCodepageMismatch2(updatedOutput.SourceLineNumbers));
                 }
             }
 
             // Compare the output types.
             if (targetOutput.Type != updatedOutput.Type)
             {
-                throw new WixException(ErrorMessages.OutputTypeMismatch(targetOutput.SourceLineNumbers, targetOutput.Type.ToString(), updatedOutput.Type.ToString()));
+                throw new WixException(WindowsInstallerBackendErrors.OutputTypeMismatch(targetOutput.SourceLineNumbers, targetOutput.Type.ToString(), updatedOutput.Type.ToString()));
             }
 
             // Compare the contents of the tables.
@@ -309,7 +309,7 @@ namespace WixToolset.Core.WindowsInstaller
                 if (0 != targetTable.Definition.CompareTo(updatedTable.Definition))
                 {
                     // continue to the next table; may be more mismatches
-                    this.messaging.Write(ErrorMessages.DatabaseSchemaMismatch(targetOutput.SourceLineNumbers, targetTable.Name));
+                    this.messaging.Write(WindowsInstallerBackendErrors.DatabaseSchemaMismatch(targetOutput.SourceLineNumbers, targetTable.Name));
                 }
                 else
                 {
@@ -369,7 +369,7 @@ namespace WixToolset.Core.WindowsInstaller
 
                         if ("*" == this.transformSummaryInfo.TargetProductCode)
                         {
-                            this.messaging.Write(ErrorMessages.ProductCodeInvalidForTransform(row.SourceLineNumbers));
+                            this.messaging.Write(WindowsInstallerBackendErrors.ProductCodeInvalidForTransform(row.SourceLineNumbers));
                         }
                     }
                     else if ("ProductVersion" == id)
@@ -415,7 +415,7 @@ namespace WixToolset.Core.WindowsInstaller
 
                         if ("*" == this.transformSummaryInfo.UpdatedProductCode)
                         {
-                            this.messaging.Write(ErrorMessages.ProductCodeInvalidForTransform(row.SourceLineNumbers));
+                            this.messaging.Write(WindowsInstallerBackendErrors.ProductCodeInvalidForTransform(row.SourceLineNumbers));
                         }
                     }
                     else if ("ProductVersion" == id)
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesFromTransforms.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesFromTransforms.cs
index 7c71e238..71f63ec9 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesFromTransforms.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/GetFileFacadesFromTransforms.cs
@@ -154,7 +154,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         // make sure Source is same. Otherwise we are silently ignoring a file.
                         if (0 != String.Compare(patchFileRow.Source, mainFileRow.Source, StringComparison.OrdinalIgnoreCase))
                         {
-                            this.Messaging.Write(ErrorMessages.SameFileIdDifferentSource(mainFileRow.SourceLineNumbers, mainFileId, patchFileRow.Source, mainFileRow.Source));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.SameFileIdDifferentSource(mainFileRow.SourceLineNumbers, mainFileId, patchFileRow.Source, mainFileRow.Source));
                         }
 
 #if TODO_PATCHING_DELTA
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs
index 475a88f9..dddb3264 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/LoadTableDefinitionsCommand.cs
@@ -47,7 +47,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 {
                     if (tableDefinitions.Contains(tableDefinition.Name))
                     {
-                        this.Messaging.Write(ErrorMessages.DuplicateExtensionTable(backendExtension.GetType().Assembly.Location, tableDefinition.Name));
+                        this.Messaging.Write(WindowsInstallerBackendErrors.DuplicateExtensionTable(backendExtension.GetType().Assembly.Location, tableDefinition.Name));
                     }
 
                     tableDefinitions.Add(tableDefinition);
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs
index 71a2e367..24837d39 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/MergeModulesCommand.cs
@@ -93,7 +93,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         }
                         catch (FormatException)
                         {
-                            this.Messaging.Write(ErrorMessages.InvalidMergeLanguage(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, wixMergeRow.Language.ToString()));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.InvalidMergeLanguage(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, wixMergeRow.Language.ToString()));
                             continue;
                         }
 
@@ -163,16 +163,16 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                             switch (mergeError.Type)
                             {
                                 case MsmErrorType.msmErrorExclusion:
-                                    this.Messaging.Write(ErrorMessages.MergeExcludedModule(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, moduleKeys.ToString()));
+                                    this.Messaging.Write(WindowsInstallerBackendErrors.MergeExcludedModule(wixMergeRow.SourceLineNumbers, wixMergeRow.Id.Id, moduleKeys.ToString()));
                                     break;
                                 case MsmErrorType.msmErrorFeatureRequired:
-                                    this.Messaging.Write(ErrorMessages.MergeFeatureRequired(wixMergeRow.SourceLineNumbers, mergeError.ModuleTable, moduleKeys.ToString(), wixMergeRow.SourceFile, wixMergeRow.Id.Id));
+                                    this.Messaging.Write(WindowsInstallerBackendErrors.MergeFeatureRequired(wixMergeRow.SourceLineNumbers, mergeError.ModuleTable, moduleKeys.ToString(), wixMergeRow.SourceFile, wixMergeRow.Id.Id));
                                     break;
                                 case MsmErrorType.msmErrorLanguageFailed:
-                                    this.Messaging.Write(ErrorMessages.MergeLanguageFailed(wixMergeRow.SourceLineNumbers, mergeError.Language, wixMergeRow.SourceFile));
+                                    this.Messaging.Write(WindowsInstallerBackendErrors.MergeLanguageFailed(wixMergeRow.SourceLineNumbers, mergeError.Language, wixMergeRow.SourceFile));
                                     break;
                                 case MsmErrorType.msmErrorLanguageUnsupported:
-                                    this.Messaging.Write(ErrorMessages.MergeLanguageUnsupported(wixMergeRow.SourceLineNumbers, mergeError.Language, wixMergeRow.SourceFile));
+                                    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));
@@ -184,7 +184,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                                     }
                                     break;
                                 case MsmErrorType.msmErrorPlatformMismatch:
-                                    this.Messaging.Write(ErrorMessages.MergePlatformMismatch(wixMergeRow.SourceLineNumbers, wixMergeRow.SourceFile));
+                                    this.Messaging.Write(WindowsInstallerBackendErrors.MergePlatformMismatch(wixMergeRow.SourceLineNumbers, wixMergeRow.SourceFile));
                                     break;
                                 default:
                                     this.Messaging.Write(ErrorMessages.UnexpectedException(String.Format(CultureInfo.CurrentUICulture, "Encountered an unexpected merge error of type '{0}' for which there is currently no error message to display.  More information about the merge and the failure can be found in the merge log: '{1}'", Enum.GetName(typeof(MsmErrorType), mergeError.Type), logPath), "InvalidOperationException", Environment.StackTrace));
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
index ff7c6579..7f8452bd 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/ProcessUncompressedFilesCommand.cs
@@ -100,7 +100,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                             {
                                 if (null == fileRecord)
                                 {
-                                    throw new WixException(ErrorMessages.FileIdentifierNotFound(facade.SourceLineNumber, facade.Id));
+                                    throw new WixException(WindowsInstallerBackendErrors.FileIdentifierNotFound(facade.SourceLineNumber, facade.Id));
                                 }
 
                                 relativeFileLayoutPath = this.PathResolver.GetFileSourcePath(directories, fileRecord[1], fileRecord[2], this.Compressed, this.LongNamesInImage);
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
index 4f739420..28fa0533 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/SequenceActionsCommand.cs
@@ -78,10 +78,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     {
                         if (collidingActionSymbol.Overridable)
                         {
-                            this.Messaging.Write(ErrorMessages.OverridableActionCollision(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.OverridableActionCollision(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action));
                             if (null != collidingActionSymbol.SourceLineNumbers)
                             {
-                                this.Messaging.Write(ErrorMessages.OverridableActionCollision2(collidingActionSymbol.SourceLineNumbers));
+                                this.Messaging.Write(WindowsInstallerBackendErrors.OverridableActionCollision2(collidingActionSymbol.SourceLineNumbers));
                             }
                         }
                     }
@@ -108,10 +108,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
                     if (requiredActionSymbols.TryGetValue(actionSymbol.Id.Id, out var collidingActionSymbol) && !collidingActionSymbol.Overridable)
                     {
-                        this.Messaging.Write(ErrorMessages.ActionCollision(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action));
+                        this.Messaging.Write(WindowsInstallerBackendErrors.ActionCollision(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action));
                         if (null != collidingActionSymbol.SourceLineNumbers)
                         {
-                            this.Messaging.Write(ErrorMessages.ActionCollision2(collidingActionSymbol.SourceLineNumbers));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.ActionCollision2(collidingActionSymbol.SourceLineNumbers));
                         }
                     }
                     else
@@ -155,10 +155,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     }
                     else // suppressing a non-overridable action symbol
                     {
-                        this.Messaging.Write(ErrorMessages.SuppressNonoverridableAction(suppressActionSymbol.SourceLineNumbers, suppressActionSymbol.SequenceTable.ToString(), suppressActionSymbol.Action));
+                        this.Messaging.Write(WindowsInstallerBackendErrors.SuppressNonoverridableAction(suppressActionSymbol.SourceLineNumbers, suppressActionSymbol.SequenceTable.ToString(), suppressActionSymbol.Action));
                         if (null != requiredActionSymbol.SourceLineNumbers)
                         {
-                            this.Messaging.Write(ErrorMessages.SuppressNonoverridableAction2(requiredActionSymbol.SourceLineNumbers));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.SuppressNonoverridableAction2(requiredActionSymbol.SourceLineNumbers));
                         }
                     }
                 }
@@ -177,14 +177,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     // check for standard actions that don't have a sequence number in a merge module
                     if (SectionType.Module == this.Section.Type && WindowsInstallerStandard.IsStandardAction(actionSymbol.Action))
                     {
-                        this.Messaging.Write(ErrorMessages.StandardActionRelativelyScheduledInModule(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action));
+                        this.Messaging.Write(WindowsInstallerBackendErrors.StandardActionRelativelyScheduledInModule(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action));
                     }
 
                     this.SequenceActionSymbol(actionSymbol, requiredActionSymbols, firstReference);
                 }
                 else if (SectionType.Module == this.Section.Type && 0 < actionSymbol.Sequence && !WindowsInstallerStandard.IsStandardAction(actionSymbol.Action)) // check for custom actions and dialogs that have a sequence number
                 {
-                    this.Messaging.Write(ErrorMessages.CustomActionSequencedInModule(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action));
+                    this.Messaging.Write(WindowsInstallerBackendErrors.CustomActionSequencedInModule(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action));
                 }
             }
 
@@ -289,19 +289,19 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         // Create errors for all the before actions.
                         foreach (var actionSymbol in relativeActions.PreviousActions)
                         {
-                            this.Messaging.Write(ErrorMessages.ActionScheduledRelativeToTerminationAction(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action, absoluteActionSymbol.Action));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.ActionScheduledRelativeToTerminationAction(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action, absoluteActionSymbol.Action));
                         }
 
                         // Create errors for all the after actions.
                         foreach (var actionSymbol in relativeActions.NextActions)
                         {
-                            this.Messaging.Write(ErrorMessages.ActionScheduledRelativeToTerminationAction(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action, absoluteActionSymbol.Action));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.ActionScheduledRelativeToTerminationAction(actionSymbol.SourceLineNumbers, actionSymbol.SequenceTable.ToString(), actionSymbol.Action, absoluteActionSymbol.Action));
                         }
 
                         // If there is source line information for the absolutely scheduled action display it
                         if (absoluteActionSymbol.SourceLineNumbers != null)
                         {
-                            this.Messaging.Write(ErrorMessages.ActionScheduledRelativeToTerminationAction2(absoluteActionSymbol.SourceLineNumbers));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.ActionScheduledRelativeToTerminationAction2(absoluteActionSymbol.SourceLineNumbers));
                         }
 
                         continue;
@@ -316,10 +316,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         // look for collisions
                         if (unusedSequence == previousUsedSequence)
                         {
-                            this.Messaging.Write(ErrorMessages.NoUniqueActionSequenceNumber(relativeActionSymbol.SourceLineNumbers, relativeActionSymbol.SequenceTable.ToString(), relativeActionSymbol.Action, absoluteActionSymbol.Action));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.NoUniqueActionSequenceNumber(relativeActionSymbol.SourceLineNumbers, relativeActionSymbol.SequenceTable.ToString(), relativeActionSymbol.Action, absoluteActionSymbol.Action));
                             if (absoluteActionSymbol.SourceLineNumbers != null)
                             {
-                                this.Messaging.Write(ErrorMessages.NoUniqueActionSequenceNumber2(absoluteActionSymbol.SourceLineNumbers));
+                                this.Messaging.Write(WindowsInstallerBackendErrors.NoUniqueActionSequenceNumber2(absoluteActionSymbol.SourceLineNumbers));
                             }
 
                             unusedSequence++;
@@ -346,10 +346,10 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
                         if (unusedSequence == nextUsedSequence)
                         {
-                            this.Messaging.Write(ErrorMessages.NoUniqueActionSequenceNumber(relativeActionSymbol.SourceLineNumbers, relativeActionSymbol.SequenceTable.ToString(), relativeActionSymbol.Action, absoluteActionSymbol.Action));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.NoUniqueActionSequenceNumber(relativeActionSymbol.SourceLineNumbers, relativeActionSymbol.SequenceTable.ToString(), relativeActionSymbol.Action, absoluteActionSymbol.Action));
                             if (absoluteActionSymbol.SourceLineNumbers != null)
                             {
-                                this.Messaging.Write(ErrorMessages.NoUniqueActionSequenceNumber2(absoluteActionSymbol.SourceLineNumbers));
+                                this.Messaging.Write(WindowsInstallerBackendErrors.NoUniqueActionSequenceNumber2(absoluteActionSymbol.SourceLineNumbers));
                             }
 
                             unusedSequence--;
@@ -681,7 +681,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 }
                 else if (existingInitialActionSymbol == actionSymbol)
                 {
-                    this.Messaging.Write(ErrorMessages.ActionCircularDependency(currentActionSymbol.SourceLineNumbers, currentActionSymbol.SequenceTable.ToString(), currentActionSymbol.Action, previousActionSymbol.Action));
+                    this.Messaging.Write(WindowsInstallerBackendErrors.ActionCircularDependency(currentActionSymbol.SourceLineNumbers, currentActionSymbol.SequenceTable.ToString(), currentActionSymbol.Action, previousActionSymbol.Action));
                 }
 
                 parentActionSymbol = this.GetParentActionSymbol(currentActionSymbol, requiredActionSymbols);
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
index 75e536c2..b6ff5fbd 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateFileFacadesCommand.cs
@@ -191,7 +191,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
 
                 if (!fileInfo.Exists)
                 {
-                    this.Messaging.Write(ErrorMessages.CannotFindFile(facade.SourceLineNumber, facade.Id, facade.FileName, facade.SourcePath));
+                    this.Messaging.Write(WindowsInstallerBackendErrors.CannotFindFile(facade.SourceLineNumber, facade.Id, facade.FileName, facade.SourcePath));
                     return;
                 }
 
@@ -199,7 +199,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 {
                     if (Int32.MaxValue < fileStream.Length)
                     {
-                        throw new WixException(ErrorMessages.FileTooLarge(facade.SourceLineNumber, facade.SourcePath));
+                        throw new WixException(WindowsInstallerBackendErrors.FileTooLarge(facade.SourceLineNumber, facade.SourcePath));
                     }
 
                     facade.FileSize = Convert.ToInt32(fileStream.Length, CultureInfo.InvariantCulture);
@@ -348,7 +348,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                             }
                             else if (assemblySymbol.ApplicationFileRef == null)
                             {
-                                throw new WixException(ErrorMessages.GacAssemblyNoStrongName(facade.SourceLineNumber, fileInfo.FullName, facade.ComponentRef));
+                                throw new WixException(WindowsInstallerBackendErrors.GacAssemblyNoStrongName(facade.SourceLineNumber, fileInfo.FullName, facade.ComponentRef));
                             }
 
                             if (!String.IsNullOrEmpty(assemblyName.FileVersion))
@@ -375,7 +375,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         var fileManifest = this.AllFileFacades.FirstOrDefault(r => r.Id.Equals(assemblySymbol.ManifestFileRef, StringComparison.Ordinal));
                         if (null == fileManifest)
                         {
-                            this.Messaging.Write(ErrorMessages.MissingManifestForWin32Assembly(facade.SourceLineNumber, facade.Id, assemblySymbol.ManifestFileRef));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.MissingManifestForWin32Assembly(facade.SourceLineNumber, facade.Id, assemblySymbol.ManifestFileRef));
                         }
 
                         try
@@ -429,7 +429,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                         String.IsNullOrEmpty(assemblySymbol.ApplicationFileRef) &&
                         !String.Equals(Path.GetFileNameWithoutExtension(facade.FileName), value, StringComparison.OrdinalIgnoreCase))
                     {
-                        this.Messaging.Write(ErrorMessages.GACAssemblyIdentityWarning(facade.SourceLineNumber, Path.GetFileNameWithoutExtension(facade.FileName), value));
+                        this.Messaging.Write(WindowsInstallerBackendErrors.GACAssemblyIdentityWarning(facade.SourceLineNumber, Path.GetFileNameWithoutExtension(facade.FileName), value));
                     }
 
                     // Override directly authored value, otherwise remember the gathered information on the facade for use later.
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateFromTextFilesCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateFromTextFilesCommand.cs
index 66a648cc..fec1302f 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateFromTextFilesCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateFromTextFilesCommand.cs
@@ -56,15 +56,15 @@ namespace WixToolset.Core.WindowsInstaller.Bind
             }
             catch (DirectoryNotFoundException e)
             {
-                this.Messaging.Write(ErrorMessages.BinderFileManagerMissingFile(sourceLineNumbers, e.Message));
+                this.Messaging.Write(WindowsInstallerBackendErrors.BinderFileManagerMissingFile(sourceLineNumbers, e.Message));
             }
             catch (FileNotFoundException e)
             {
-                this.Messaging.Write(ErrorMessages.BinderFileManagerMissingFile(sourceLineNumbers, e.Message));
+                this.Messaging.Write(WindowsInstallerBackendErrors.BinderFileManagerMissingFile(sourceLineNumbers, e.Message));
             }
             catch (IOException e)
             {
-                this.Messaging.Write(ErrorMessages.BinderFileManagerMissingFile(sourceLineNumbers, e.Message));
+                this.Messaging.Write(WindowsInstallerBackendErrors.BinderFileManagerMissingFile(sourceLineNumbers, e.Message));
             }
             catch (NotSupportedException)
             {
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
index 209ab550..56f32308 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Bind/UpdateTransformsWithFileFacades.cs
@@ -301,14 +301,14 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                     {
                         if (duplicateFilesSequence < installFilesSequence)
                         {
-                            throw new WixException(ErrorMessages.InsertInvalidSequenceActionOrder(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionSymbol.Action));
+                            throw new WixException(WindowsInstallerBackendErrors.InsertInvalidSequenceActionOrder(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionSymbol.Action));
                         }
                         else
                         {
                             sequence = (duplicateFilesSequence + installFilesSequence) / 2;
                             if (installFilesSequence == sequence || duplicateFilesSequence == sequence)
                             {
-                                throw new WixException(ErrorMessages.InsertSequenceNoSpace(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionSymbol.Action));
+                                throw new WixException(WindowsInstallerBackendErrors.InsertSequenceNoSpace(mainFileRow.SourceLineNumbers, tableName, "InstallFiles", "DuplicateFiles", patchFilesActionSymbol.Action));
                             }
                         }
                     }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/TransformSubcommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/TransformSubcommand.cs
index 373cd2d4..f5e6f1de 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/TransformSubcommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/CommandLine/TransformSubcommand.cs
@@ -325,7 +325,7 @@ namespace WixToolset.Core.WindowsInstaller.CommandLine
 
                 if (null == transform.Tables || 0 >= transform.Tables.Count)
                 {
-                    this.Messaging.Write(ErrorMessages.NoDifferencesInTransform(new SourceLineNumber(this.OutputPath)));
+                    this.Messaging.Write(WindowsInstallerBackendErrors.NoDifferencesInTransform(new SourceLineNumber(this.OutputPath)));
                 }
             }
 
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
index 8f23a886..dc3ee06d 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Decompile/Decompiler.cs
@@ -199,7 +199,7 @@ namespace WixToolset.Core.WindowsInstaller.Decompile
                     }
                     else
                     {
-                        this.Messaging.Write(ErrorMessages.DuplicateExtensionTable(extension.GetType().ToString(), tableDefinition.Name));
+                        this.Messaging.Write(WindowsInstallerBackendErrors.DuplicateExtensionTable(extension.GetType().ToString(), tableDefinition.Name));
                     }
                 }
             }
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Differ.cs b/src/wix/WixToolset.Core.WindowsInstaller/Differ.cs
index e4cfe22d..dff24d1a 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Differ.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Differ.cs
@@ -66,17 +66,17 @@ namespace WixToolset.Core.WindowsInstaller
             // compare the codepages
             if (targetOutput.Codepage != updatedOutput.Codepage && 0 == (TransformFlags.ErrorChangeCodePage & validationFlags))
             {
-                this.messaging.Write(ErrorMessages.OutputCodepageMismatch(targetOutput.SourceLineNumbers, targetOutput.Codepage, updatedOutput.Codepage));
+                this.messaging.Write(WindowsInstallerBackendErrors.OutputCodepageMismatch(targetOutput.SourceLineNumbers, targetOutput.Codepage, updatedOutput.Codepage));
                 if (null != updatedOutput.SourceLineNumbers)
                 {
-                    this.messaging.Write(ErrorMessages.OutputCodepageMismatch2(updatedOutput.SourceLineNumbers));
+                    this.messaging.Write(WindowsInstallerBackendErrors.OutputCodepageMismatch2(updatedOutput.SourceLineNumbers));
                 }
             }
 
             // compare the output types
             if (targetOutput.Type != updatedOutput.Type)
             {
-                throw new WixException(ErrorMessages.OutputTypeMismatch(targetOutput.SourceLineNumbers, targetOutput.Type.ToString(), updatedOutput.Type.ToString()));
+                throw new WixException(WindowsInstallerBackendErrors.OutputTypeMismatch(targetOutput.SourceLineNumbers, targetOutput.Type.ToString(), updatedOutput.Type.ToString()));
             }
 
             // compare the contents of the tables
@@ -328,7 +328,7 @@ namespace WixToolset.Core.WindowsInstaller
                 if (0 != targetTable.Definition.CompareTo(updatedTable.Definition))
                 {
                     // continue to the next table; may be more mismatches
-                    this.messaging.Write(ErrorMessages.DatabaseSchemaMismatch(targetOutput.SourceLineNumbers, targetTable.Name));
+                    this.messaging.Write(WindowsInstallerBackendErrors.DatabaseSchemaMismatch(targetOutput.SourceLineNumbers, targetTable.Name));
                 }
                 else
                 {
@@ -380,7 +380,7 @@ namespace WixToolset.Core.WindowsInstaller
                         this.transformSummaryInfo.TargetProductCode = (string)row[1];
                         if ("*" == this.transformSummaryInfo.TargetProductCode)
                         {
-                            this.messaging.Write(ErrorMessages.ProductCodeInvalidForTransform(row.SourceLineNumbers));
+                            this.messaging.Write(WindowsInstallerBackendErrors.ProductCodeInvalidForTransform(row.SourceLineNumbers));
                         }
                     }
                     else if ("ProductVersion" == (string)row[0])
@@ -421,7 +421,7 @@ namespace WixToolset.Core.WindowsInstaller
                         this.transformSummaryInfo.UpdatedProductCode = (string)row[1];
                         if ("*" == this.transformSummaryInfo.UpdatedProductCode)
                         {
-                            this.messaging.Write(ErrorMessages.ProductCodeInvalidForTransform(row.SourceLineNumbers));
+                            this.messaging.Write(WindowsInstallerBackendErrors.ProductCodeInvalidForTransform(row.SourceLineNumbers));
                         }
                     }
                     else if ("ProductVersion" == (string)row[0])
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
index 344cccb8..bd1b31e0 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Inscribe/InscribeMsiPackageCommand.cs
@@ -57,7 +57,7 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe
             var attributes = File.GetAttributes(databasePath);
             if (FileAttributes.ReadOnly == (attributes & FileAttributes.ReadOnly))
             {
-                this.Messaging.Write(ErrorMessages.ReadOnlyOutputFile(databasePath));
+                this.Messaging.Write(WindowsInstallerBackendErrors.ReadOnlyOutputFile(databasePath));
                 return shouldCommit;
             }
 
@@ -175,7 +175,7 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe
                         // If the cabs aren't there, throw an error but continue to catch the other errors
                         if (!File.Exists(cabPath))
                         {
-                            this.Messaging.Write(ErrorMessages.WixFileNotFound(cabPath));
+                            this.Messaging.Write(WindowsInstallerBackendErrors.WixFileNotFound(cabPath));
                             continue;
                         }
 
@@ -201,11 +201,11 @@ namespace WixToolset.Core.WindowsInstaller.Inscribe
                             if ((5 == Environment.OSVersion.Version.Major && 2 == Environment.OSVersion.Version.Minor) || // W2K3
                                 (5 == Environment.OSVersion.Version.Major && 1 == Environment.OSVersion.Version.Minor)) // XP
                             {
-                                this.Messaging.Write(ErrorMessages.UnableToGetAuthenticodeCertOfFileDownlevelOS(cabPath, String.Format(CultureInfo.InvariantCulture, "HRESULT: 0x{0:x8}", HResult)));
+                                this.Messaging.Write(WindowsInstallerBackendErrors.UnableToGetAuthenticodeCertOfFileDownlevelOS(cabPath, String.Format(CultureInfo.InvariantCulture, "HRESULT: 0x{0:x8}", HResult)));
                             }
                             else // otherwise, generic error
                             {
-                                this.Messaging.Write(ErrorMessages.UnableToGetAuthenticodeCertOfFile(cabPath, String.Format(CultureInfo.InvariantCulture, "HRESULT: 0x{0:x8}", HResult)));
+                                this.Messaging.Write(WindowsInstallerBackendErrors.UnableToGetAuthenticodeCertOfFile(cabPath, String.Format(CultureInfo.InvariantCulture, "HRESULT: 0x{0:x8}", HResult)));
                             }
                         }
 
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindTransformCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindTransformCommand.cs
index 5df38db3..5b92fa91 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindTransformCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Unbind/UnbindTransformCommand.cs
@@ -290,7 +290,7 @@ namespace WixToolset.Core.WindowsInstaller.Unbind
                     // this commonly happens when the transform was built
                     // against a database schema different from the internal
                     // table definitions
-                    throw new WixException(ErrorMessages.TransformSchemaMismatch());
+                    throw new WixException(WindowsInstallerBackendErrors.TransformSchemaMismatch());
                 }
             }
 
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs b/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs
index a9f03171..169a1e29 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/Validate/ValidateDatabaseCommand.cs
@@ -116,7 +116,7 @@ namespace WixToolset.Core.WindowsInstaller.Validate
             {
                 case ValidationMessageType.InternalFailure:
                 case ValidationMessageType.Error:
-                    this.Messaging.Write(ErrorMessages.ValidationError(messageSourceLineNumbers, message.IceName, message.Description));
+                    this.Messaging.Write(WindowsInstallerBackendErrors.ValidationError(messageSourceLineNumbers, message.IceName, message.Description));
                     break;
                 case ValidationMessageType.Warning:
                     this.Messaging.Write(WarningMessages.ValidationWarning(messageSourceLineNumbers, message.IceName, message.Description));
diff --git a/src/wix/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendErrors.cs b/src/wix/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendErrors.cs
index 0935d964..ae9a03f4 100644
--- a/src/wix/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendErrors.cs
+++ b/src/wix/WixToolset.Core.WindowsInstaller/WindowsInstallerBackendErrors.cs
@@ -54,6 +54,441 @@ namespace WixToolset.Core.WindowsInstaller
             return Message(null, Ids.UnknownValidationTargetFileExtension, "Unknown file extension: {0}. Use the -cub switch to specify the path to the ICE CUBe file", fileExtension);
         }
 
+        public static Message ActionCircularDependency(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName1, string actionName2)
+        {
+            return Message(sourceLineNumbers, Ids.ActionCircularDependency, "The {0} table contains an action '{1}' that is scheduled to come before or after action '{2}', which is also scheduled to come before or after action '{1}'. Please remove this circular dependency by changing the Before or After attribute for one of the actions.", sequenceTableName, actionName1, actionName2);
+        }
+
+        public static Message ActionCollision(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
+        {
+            return Message(sourceLineNumbers, Ids.ActionCollision, "The {0} table contains an action '{1}' that is declared in two different locations. Please remove one of the actions or set the Overridable='yes' attribute on one of their elements.", sequenceTableName, actionName);
+        }
+
+        public static Message ActionCollision2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.ActionCollision2, "The location of the action related to previous error.");
+        }
+
+        public static Message ActionScheduledRelativeToTerminationAction(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName1, string actionName2)
+        {
+            return Message(sourceLineNumbers, Ids.ActionScheduledRelativeToTerminationAction, "The {0} table contains an action '{1}' that is scheduled to come before or after action '{2}', which is a special action which only occurs when the installer terminates. These special actions can be identified by their negative sequence numbers. Please schedule the action '{1}' to come before or after a different action.", sequenceTableName, actionName1, actionName2);
+        }
+
+        public static Message ActionScheduledRelativeToTerminationAction2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.ActionScheduledRelativeToTerminationAction2, "The location of the special termination action related to previous error(s).");
+        }
+
+        public static Message BinderFileManagerMissingFile(SourceLineNumber sourceLineNumbers, string exceptionMessage)
+        {
+            return Message(sourceLineNumbers, Ids.BinderFileManagerMissingFile, "{0}", exceptionMessage);
+        }
+
+        public static Message BothUpgradeCodesRequired()
+        {
+            return Message(null, Ids.BothUpgradeCodesRequired, "Both the target and updated package authoring must define the Package/@UpgradeCode attribute if the transform validates the UpgradeCode (default). Either define the Package/@UpgradeCode attribute in both the target and updated authoring, or set the Validate/@UpgradeCode attribute to 'no' in the patch authoring.");
+        }
+
+        public static Message CabExtractionFailed(string cabName, string directoryName)
+        {
+            return Message(null, Ids.CabExtractionFailed, "Failed to extract cab '{0}' to directory '{1}'. This is most likely due to a lack of available disk space on the destination drive.", cabName, directoryName);
+        }
+
+        public static Message CabExtractionFailed(string cabName, string mergeModulePath, string directoryName)
+        {
+            return Message(null, Ids.CabExtractionFailed, "Failed to extract cab '{0}' from merge module '{1}' to directory '{2}'. This is most likely due to a lack of available disk space on the destination drive.", cabName, mergeModulePath, directoryName);
+        }
+
+        public static Message CabFileDoesNotExist(string cabName, string mergeModulePath, string directoryName)
+        {
+            return Message(null, Ids.CabFileDoesNotExist, "Attempted to extract cab '{0}' from merge module '{1}' to directory '{2}'. The cab file was not found. This usually means that you have a merge module without a cabinet inside it.", cabName, mergeModulePath, directoryName);
+        }
+
+        public static Message CannotFindFile(SourceLineNumber sourceLineNumbers, string fileId, string fileName, string filePath)
+        {
+            return Message(sourceLineNumbers, Ids.CannotFindFile, "The file with id '{0}' and name '{1}' could not be found with source path: '{2}'.", fileId, fileName, filePath);
+        }
+
+        public static Message CannotOpenMergeModule(SourceLineNumber sourceLineNumbers, string mergeModuleIdentifier, string mergeModuleFile)
+        {
+            return Message(sourceLineNumbers, Ids.CannotOpenMergeModule, "Cannot open the merge module '{0}' from file '{1}'.", mergeModuleIdentifier, mergeModuleFile);
+        }
+
+        public static Message CouldNotDetermineProductCodeFromTransformSummaryInfo()
+        {
+            return Message(null, Ids.CouldNotDetermineProductCodeFromTransformSummaryInfo, "Could not determine ProductCode from transform summary information.");
+        }
+
+        public static Message CreateCabAddFileFailed()
+        {
+            return Message(null, Ids.CreateCabAddFileFailed, "An error (E_FAIL) was returned while creating a CAB file. The most common cause of this error is attempting to create a CAB file larger than 2GB. You can reduce the size of your installation package, use a higher compression level, or split your files into more than one CAB file.");
+        }
+
+        public static Message CreateCabInsufficientDiskSpace()
+        {
+            return Message(null, Ids.CreateCabInsufficientDiskSpace, "An error (ERROR_DISK_FULL) was returned while creating a CAB file. This means you have insufficient disk space. Clear disk space and try again.");
+        }
+
+        public static Message CustomActionSequencedInModule(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
+        {
+            return Message(sourceLineNumbers, Ids.CustomActionSequencedInModule, "The {0} table contains a custom action '{1}' that has a sequence number specified. The Sequence attribute is not allowed for custom actions in a merge module. Please remove the action or use the Before or After attributes to specify where this action should be sequenced relative to another action.", sequenceTableName, actionName);
+        }
+
+        public static Message DatabaseSchemaMismatch(SourceLineNumber sourceLineNumbers, string tableName)
+        {
+            return Message(sourceLineNumbers, Ids.DatabaseSchemaMismatch, "The table definition of '{0}' in the target database does not match the table definition in the updated database. A transform requires that the target database schema match the updated database schema.", tableName);
+        }
+
+        public static Message DuplicateCabinetName(SourceLineNumber sourceLineNumbers, string cabinetName)
+        {
+            return Message(sourceLineNumbers, Ids.DuplicateCabinetName, "Duplicate cabinet name '{0}' found.", cabinetName);
+        }
+
+        public static Message DuplicateCabinetName2(SourceLineNumber sourceLineNumbers, string cabinetName)
+        {
+            return Message(sourceLineNumbers, Ids.DuplicateCabinetName2, "Duplicate cabinet name '{0}' error related to previous error.", cabinetName);
+        }
+
+        public static Message DuplicateComponentGuids(SourceLineNumber sourceLineNumbers, string componentId, string guid, string type, string keyPath)
+        {
+            return Message(sourceLineNumbers, Ids.DuplicateComponentGuids, "Component/@Id='{0}' with {2} '{3}' has a @Guid value '{1}' that duplicates another component in this package. It is recommended to give each component its own unique GUID.", componentId, guid, type, keyPath);
+        }
+
+        public static Message DuplicateExtensionTable(string extension, string tableName)
+        {
+            return Message(null, Ids.DuplicateExtensionTable, "The extension '{0}' contains a definition for table '{1}' that collides with a previously loaded table definition. Please remove one of the conflicting extensions or rename one of the tables to avoid the collision.", extension, tableName);
+        }
+
+        public static Message DuplicateModuleCaseInsensitiveFileIdentifier(SourceLineNumber sourceLineNumbers, string moduleId, string fileId1, string fileId2)
+        {
+            return Message(sourceLineNumbers, Ids.DuplicateModuleCaseInsensitiveFileIdentifier, "The merge module '{0}' contains 2 or more file identifiers that only differ by case: '{1}' and '{2}'. The WiX toolset extracts merge module files to the file system using these identifiers. Since most file systems are not case-sensitive a collision is likely. Please contact the owner of the merge module for a fix.", moduleId, fileId1, fileId2);
+        }
+
+        public static Message DuplicateModuleFileIdentifier(SourceLineNumber sourceLineNumbers, string moduleId, string fileId)
+        {
+            return Message(sourceLineNumbers, Ids.DuplicateModuleFileIdentifier, "The merge module '{0}' contains a file identifier, '{1}', that is duplicated either in another merge module or in a File/@Id attribute. File identifiers must be unique. Please change one of the file identifiers to a different value.", moduleId, fileId);
+        }
+
+        public static Message ExpectedClientPatchIdInWixMsp()
+        {
+            return Message(null, Ids.ExpectedClientPatchIdInWixMsp, "The WixMsp is missing the client patch ID. Recompile the patch source files with the latest WiX toolset.");
+        }
+
+        public static Message ExpectedMediaCabinet(SourceLineNumber sourceLineNumbers, string fileId, int diskId)
+        {
+            return Message(sourceLineNumbers, Ids.ExpectedMediaCabinet, "The file '{0}' should be compressed but is not part of a compressed media. Files will be compressed if either the File/@Compressed or Package/@Compressed attributes are set to 'yes'. This can be fixed by setting the Media/@Cabinet attribute for media '{1}'.", fileId, diskId);
+        }
+
+        public static Message ExpectedMediaRowsInWixMsp()
+        {
+            return Message(null, Ids.ExpectedMediaRowsInWixMsp, "The WixMsp has no media rows defined.");
+        }
+
+        public static Message ExpectedPatchIdInWixMsp()
+        {
+            return Message(null, Ids.ExpectedPatchIdInWixMsp, "The WixMsp is missing the patch ID.");
+        }
+
+        public static Message FileIdentifierNotFound(SourceLineNumber sourceLineNumbers, string fileIdentifier)
+        {
+            return Message(sourceLineNumbers, Ids.FileIdentifierNotFound, "The file row with identifier '{0}' could not be found.", fileIdentifier);
+        }
+
+        public static Message FileTooLarge(SourceLineNumber sourceLineNumbers, string fileName)
+        {
+            return Message(sourceLineNumbers, Ids.FileTooLarge, "'{0}' is too large, file size must be less than 2147483648.", fileName);
+        }
+
+        public static Message GACAssemblyIdentityWarning(SourceLineNumber sourceLineNumbers, string fileName, string assemblyName)
+        {
+            return Message(sourceLineNumbers, Ids.GACAssemblyIdentityWarning, "The destination name of file '{0}' does not match its assembly name '{1}' in your authoring. This will cause an installation failure for this assembly, because it will be installed to the Global Assembly Cache. To fix this error, update File/@Name of file '{0}' to be the actual name of the assembly.", fileName, assemblyName);
+        }
+
+        public static Message GacAssemblyNoStrongName(SourceLineNumber sourceLineNumbers, string assemblyName, string componentName)
+        {
+            return Message(sourceLineNumbers, Ids.GacAssemblyNoStrongName, "Assembly {0} in component {1} has no strong name and has been marked to be placed in the GAC. All assemblies installed to the GAC must have a valid strong name.", assemblyName, componentName);
+        }
+
+        public static Message IllegalGeneratedGuidComponentUnversionedKeypath(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalGeneratedGuidComponentUnversionedKeypath, "The Component/@Guid attribute's value '*' is not valid for this component because it does not meet the criteria for having an automatically generated guid. Components with more than one file cannot use an automatically generated guid unless a versioned file is the keypath and the other files are unversioned. This component's keypath is not versioned. Create multiple components to use automatically generated guids.");
+        }
+
+        public static Message IllegalGeneratedGuidComponentVersionedNonkeypath(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalGeneratedGuidComponentVersionedNonkeypath, "The Component/@Guid attribute's value '*' is not valid for this component because it does not meet the criteria for having an automatically generated guid. Components with more than one file cannot use an automatically generated guid unless a versioned file is the keypath and the other files are unversioned. This component has a non-keypath file that is versioned. Create multiple components to use automatically generated guids.");
+        }
+
+        public static Message IllegalPathForGeneratedComponentGuid(SourceLineNumber sourceLineNumbers, string componentName, string keyFilePath)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalPathForGeneratedComponentGuid, "The component '{0}' has a key file with path '{1}'. Since this path is not rooted in one of the standard directories (like ProgramFilesFolder), this component does not fit the criteria for having an automatically generated guid. (This error may also occur if a path contains a likely standard directory such as nesting a directory with name \"Common Files\" under ProgramFilesFolder.)", componentName, keyFilePath);
+        }
+
+        public static Message InsertInvalidSequenceActionOrder(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionNameBefore, string actionNameAfter, string actionNameNew)
+        {
+            return Message(sourceLineNumbers, Ids.InsertInvalidSequenceActionOrder, "Invalid order of actions {1} and {2} in sequence table {0}. Action {3} must occur after {1} and before {2}, but {2} is currently sequenced after {1}. Please fix the ordering or explicitly supply a location for the action {3}.", sequenceTableName, actionNameBefore, actionNameAfter, actionNameNew);
+        }
+
+        public static Message InsertSequenceNoSpace(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionNameBefore, string actionNameAfter, string actionNameNew)
+        {
+            return Message(sourceLineNumbers, Ids.InsertSequenceNoSpace, "Not enough space exists to sequence action {3} in table {0}. It must be sequenced after {1} and before {2}, but those two actions are currently sequenced next to each other. Please move one of those actions to allow {3} to be inserted between them.", sequenceTableName, actionNameBefore, actionNameAfter, actionNameNew);
+        }
+
+        public static Message IntermediatesMustBeResolved(string invalidIntermediate)
+        {
+            return Message(null, Ids.IntermediatesMustBeResolved, "Intermediates being bound must have been resolved. This intermediate was not resolved: {0}", invalidIntermediate);
+        }
+
+        public static Message InvalidAddedFileRowWithoutSequence(SourceLineNumber sourceLineNumbers, string fileRowId)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidAddedFileRowWithoutSequence, "A row has been added to the File table with id '{1}' that does not have a sequence number assigned to it. Create your transform from a pair of msi's instead of xml outputs to get sequences assigned to your File table's rows.", fileRowId);
+        }
+
+        public static Message InvalidAssemblyFile(SourceLineNumber sourceLineNumbers, string assemblyFile, string moreInformation)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidAssemblyFile, "The assembly file '{0}' appears to be invalid. Please ensure this is a valid assembly file and that the user has the appropriate access rights to this file. More information: {1}", assemblyFile, moreInformation);
+        }
+
+        public static Message InvalidKeyColumn(string tableName, string columnName, string foreignTableName, int foreignColumnNumber)
+        {
+            return Message(null, Ids.InvalidKeyColumn, "The definition for the '{0}' table's '{1}' column is an invalid foreign key relationship to the {2} table's column number {3}. It is not a valid foreign key table column number because it is too small (less than 1) or greater than the count of columns in the foreign table's definition.", tableName, columnName, foreignTableName, foreignColumnNumber);
+        }
+
+        public static Message InvalidKeypathChange(SourceLineNumber sourceLineNumbers, string component, string transformPath)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidKeypathChange, "Component '{0}' has a changed keypath in the transform '{1}'. Patches cannot change the keypath of a component.", component, transformPath);
+        }
+
+        public static Message InvalidManifestContent(SourceLineNumber sourceLineNumbers, string fileName)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidManifestContent, "The manifest '{0}' does not have the required assembly/assemblyIdentity element.", fileName);
+        }
+
+        public static Message InvalidMergeLanguage(SourceLineNumber sourceLineNumbers, string mergeId, string mergeLanguage)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidMergeLanguage, "The Merge element '{0}' specified an invalid language '{1}'. Verify that localization tokens are being properly resolved to a numeric LCID.", mergeId, mergeLanguage);
+        }
+
+        public static Message InvalidRemoveComponent(SourceLineNumber sourceLineNumbers, string component, string feature, string transformPath)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidRemoveComponent, "Removing component '{0}' from feature '{1}' is not supported. Either the component was removed or the guid changed in the transform '{2}'. Add the component back, undo the change to the component guid, or remove the entire feature.", component, feature, transformPath);
+        }
+
+        public static Message InvalidStringForCodepage(SourceLineNumber sourceLineNumbers, string codepage)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidStringForCodepage, "A string was provided with characters that are not available in the specified database code page '{0}'. Either change these characters to ones that exist in the database's code page, or update the database's code page by modifying one of the following attributes: Package/@Codepage, Module/@Codepage, Patch/@Codepage, or WixLocalization/@Codepage.", codepage);
+        }
+
+        public static Message MaximumCabinetSizeForLargeFileSplittingTooLarge(SourceLineNumber sourceLineNumbers, int maximumCabinetSizeForLargeFileSplitting, int maxValueOfMaxCabSizeForLargeFileSplitting)
+        {
+            return Message(sourceLineNumbers, Ids.MaximumCabinetSizeForLargeFileSplittingTooLarge, "'{0}' is too large. Reduce the size of maximum cabinet size for large file splitting. The maximum permitted value is '{1}' MB.", maximumCabinetSizeForLargeFileSplitting, maxValueOfMaxCabSizeForLargeFileSplitting);
+        }
+
+        public static Message MaximumUncompressedMediaSizeTooLarge(SourceLineNumber sourceLineNumbers, int maximumUncompressedMediaSize)
+        {
+            return Message(sourceLineNumbers, Ids.MaximumUncompressedMediaSizeTooLarge, "'{0}' is too large. Reduce the size of maximum uncompressed media size.", maximumUncompressedMediaSize);
+        }
+
+        public static Message MediaTableCollision(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.MediaTableCollision, "Only one of Media and MediaTemplate tables should be authored.");
+        }
+
+        public static Message MergeExcludedModule(SourceLineNumber sourceLineNumbers, string mergeId, string otherMergeId)
+        {
+            return Message(sourceLineNumbers, Ids.MergeExcludedModule, "The module '{0}' cannot be merged because it excludes or is excluded by the merge module with signature '{1}'.", mergeId, otherMergeId);
+        }
+
+        public static Message MergeFeatureRequired(SourceLineNumber sourceLineNumbers, string tableName, string primaryKeys, string mergeModuleFile, string mergeId)
+        {
+            return Message(sourceLineNumbers, Ids.MergeFeatureRequired, "The {0} table contains a row with primary key(s) '{1}' which requires a feature to properly merge from the merge module '{2}'. Nest a MergeRef element with an Id attribute set to the value '{3}' under a Feature element to fix this error.", tableName, primaryKeys, mergeModuleFile, mergeId);
+        }
+
+        public static Message MergeLanguageFailed(SourceLineNumber sourceLineNumbers, short language, string mergeModuleFile)
+        {
+            return Message(sourceLineNumbers, Ids.MergeLanguageFailed, "The language '{0}' is supported but uses an invalid language transform in the merge module '{1}'.", language, mergeModuleFile);
+        }
+
+        public static Message MergeLanguageUnsupported(SourceLineNumber sourceLineNumbers, short language, string mergeModuleFile)
+        {
+            return Message(sourceLineNumbers, Ids.MergeLanguageUnsupported, "Could not locate language '{0}' (or a transform for this language) in the merge module '{1}'. This is likely due to an incorrectly authored Merge/@Language attribute.", language, mergeModuleFile);
+        }
+
+        public static Message MergePlatformMismatch(SourceLineNumber sourceLineNumbers, string mergeModuleFile)
+        {
+            return Message(sourceLineNumbers, Ids.MergePlatformMismatch, "'{0}' is a 64-bit merge module but the product consuming it is 32-bit. 32-bit products can consume only 32-bit merge modules.", mergeModuleFile);
+        }
+
+        public static Message MissingManifestForWin32Assembly(SourceLineNumber sourceLineNumbers, string file, string manifest)
+        {
+            return Message(sourceLineNumbers, Ids.MissingManifestForWin32Assembly, "File '{0}' is marked as a Win32 assembly but it refers to assembly manifest '{1}' that is not present in this product.", file, manifest);
+        }
+
+        public static Message MissingMedia(SourceLineNumber sourceLineNumbers, int diskId)
+        {
+            return Message(sourceLineNumbers, Ids.MissingMedia, "There is no media defined for disk id '{0}'. You must author either <Media Id='{0}' ...> or <MediaTemplate ...>.", diskId);
+        }
+
+        public static Message MissingOrInvalidModuleInstallerVersion(SourceLineNumber sourceLineNumbers, string moduleId, string mergeModuleFile, string productInstallerVersion)
+        {
+            return Message(sourceLineNumbers, Ids.MissingOrInvalidModuleInstallerVersion, "The merge module '{0}' from file '{1}' is either missing or has an invalid installer version. The value read from the installer version in module's summary information was '{2}'. This should be a numeric value representing a valid installer version such as 200 or 301.", moduleId, mergeModuleFile, productInstallerVersion);
+        }
+
+        public static Message NewRowAddedInTable(SourceLineNumber sourceLineNumbers, string productCode, string tableName, string rowId)
+        {
+            return Message(sourceLineNumbers, Ids.NewRowAddedInTable, "Product '{0}': Table '{1}' has a new row '{2}' added. This makes the patch not uninstallable.", productCode, tableName, rowId);
+        }
+
+        public static Message NoDataForColumn(SourceLineNumber sourceLineNumbers, string columnName, string tableName)
+        {
+            return Message(sourceLineNumbers, Ids.NoDataForColumn, "There is no data for column '{0}' in a contained row of custom table '{1}'. A non-null value must be supplied for this column.", columnName, tableName);
+        }
+
+        public static Message NoDifferencesInTransform(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.NoDifferencesInTransform, "The transform being built did not contain any differences so it could not be created.");
+        }
+
+        public static Message NoUniqueActionSequenceNumber(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName1, string actionName2)
+        {
+            return Message(sourceLineNumbers, Ids.NoUniqueActionSequenceNumber, "The {0} table contains an action '{1}' which cannot have a unique sequence number because it is scheduled before or after action '{2}'. There is not enough room before or after this action to assign a unique sequence number. Please schedule one of the actions differently so that it will be in a position with more sequence numbers available. Please note that sequence numbers must be an integer in the range 1 - 32767 (inclusive).", sequenceTableName, actionName1, actionName2);
+        }
+
+        public static Message NoUniqueActionSequenceNumber2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.NoUniqueActionSequenceNumber2, "The location of the sequenced action related to previous error.");
+        }
+
+        public static Message OutputCodepageMismatch(SourceLineNumber sourceLineNumbers, int beforeCodepage, int afterCodepage)
+        {
+            return Message(sourceLineNumbers, Ids.OutputCodepageMismatch, "The code pages of the outputs do not match. One output's code page is '{0}' while the other is '{1}'.", beforeCodepage, afterCodepage);
+        }
+
+        public static Message OutputCodepageMismatch2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.OutputCodepageMismatch2, "The location of the mismatched code page related to the previous warning.");
+        }
+
+        public static Message OutputTypeMismatch(SourceLineNumber sourceLineNumbers, string beforeOutputType, string afterOutputType)
+        {
+            return Message(sourceLineNumbers, Ids.OutputTypeMismatch, "The types of the outputs do not match. One output's type is '{0}' while the other is '{1}'.", beforeOutputType, afterOutputType);
+        }
+
+        public static Message OverlengthTableNameInProductOrMergeModule(SourceLineNumber sourceLineNumbers, string tableName)
+        {
+            return Message(sourceLineNumbers, Ids.OverlengthTableNameInProductOrMergeModule, "The table name '{0}' is invalid because the table name exceeds 31 characters in length. For more information, see: https://learn.microsoft.com/en-au/windows/win32/msi/table-names", tableName);
+        }
+
+        public static Message OverridableActionCollision(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
+        {
+            return Message(sourceLineNumbers, Ids.OverridableActionCollision, "The {0} table contains an action '{1}' that is declared overridable in two different locations. Please remove one of the actions or the Overridable='yes' attribute from one of the actions.", sequenceTableName, actionName);
+        }
+
+        public static Message OverridableActionCollision2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.OverridableActionCollision2, "The location of the action related to previous error.");
+        }
+
+        public static Message PatchNotRemovable()
+        {
+            return Message(null, Ids.PatchNotRemovable, "This patch is not uninstallable. The 'Patch' element's attribute 'AllowRemoval' should be set to 'no'.");
+        }
+
+        public static Message PatchWithoutTransforms()
+        {
+            return Message(null, Ids.PatchWithoutTransforms, "No transforms were provided to attach to the patch.");
+        }
+
+        public static Message PatchWithoutValidTransforms()
+        {
+            return Message(null, Ids.PatchWithoutValidTransforms, "No valid transforms were provided to attach to the patch. Check to make sure the transforms you passed on the command line have a matching baseline authored in the patch. Also, make sure there are differences between your target and upgrade.");
+        }
+
+        public static Message ProductCodeInvalidForTransform(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.ProductCodeInvalidForTransform, "The value '*' is not valid for the ProductCode when used in a transform or in a patch. Copy the ProductCode from your target product MSI into the Package/@ProductCode attribute value for your product authoring.");
+        }
+
+        public static Message ReadOnlyOutputFile(string filePath)
+        {
+            return Message(null, Ids.ReadOnlyOutputFile, "Unable to output to file '{0}' because it is marked as read-only.", filePath);
+        }
+
+        public static Message SameFileIdDifferentSource(SourceLineNumber sourceLineNumbers, string fileId, string sourcePath1, string sourcePath2)
+        {
+            return Message(sourceLineNumbers, Ids.SameFileIdDifferentSource, "Two different source paths '{1}' and '{2}' were detected for the same file identifier '{0}'. You must either author these under Media elements with different Id attribute values or in different patches.", fileId, sourcePath1, sourcePath2);
+        }
+
+        public static Message SplitCabinetCopyRegistrationFailed(string newCabName, string firstCabName)
+        {
+            return Message(null, Ids.SplitCabinetCopyRegistrationFailed, "Failed to register the copy command for cabinet '{0}' formed by splitting cabinet '{1}'.", newCabName, firstCabName);
+        }
+
+        public static Message StandardActionRelativelyScheduledInModule(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
+        {
+            return Message(sourceLineNumbers, Ids.StandardActionRelativelyScheduledInModule, "The {0} table contains a standard action '{1}' that does not have a sequence number specified. The Sequence attribute is required for standard actions in a merge module. Please remove the action or use the Sequence attribute.", sequenceTableName, actionName);
+        }
+
+        public static Message SuppressNonoverridableAction(SourceLineNumber sourceLineNumbers, string sequenceTableName, string actionName)
+        {
+            return Message(sourceLineNumbers, Ids.SuppressNonoverridableAction, "The {0} table contains an action '{1}' that cannot be suppressed because it is not declared overridable in the base definition. Please stop suppressing the action or make it overridable in its base declaration.", sequenceTableName, actionName);
+        }
+
+        public static Message SuppressNonoverridableAction2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.SuppressNonoverridableAction2, "The location of the non-overridable definition of the action related to previous error.");
+        }
+
+        public static Message TooManyColumnsInRealTable(string tableName, int columnCount, int supportedColumnCount)
+        {
+            return Message(null, Ids.TooManyColumnsInRealTable, "The table '{0}' contains {1} columns which is not supported by Windows Installer. Windows Installer supports a maximum of {2} columns.", tableName, columnCount, supportedColumnCount);
+        }
+
+        public static Message TransformSchemaMismatch()
+        {
+            return Message(null, Ids.TransformSchemaMismatch, "The transform schema does not match the database schema. The transform may have been generated from a different database.");
+        }
+
+        public static Message UnableToGetAuthenticodeCertOfFile(string filePath, string moreInformation)
+        {
+            return Message(null, Ids.UnableToGetAuthenticodeCertOfFile, "Unable to get the authenticode certificate of '{0}'. More information: {1}", filePath, moreInformation);
+        }
+
+        public static Message UnableToGetAuthenticodeCertOfFileDownlevelOS(string filePath, string moreInformation)
+        {
+            return Message(null, Ids.UnableToGetAuthenticodeCertOfFileDownlevelOS, "Unable to get the authenticode certificate of '{0}'. The cryptography API has limitations on Windows XP and Windows Server 2003. More information: {1}", filePath, moreInformation);
+        }
+
+        public static Message UnableToOpenModule(SourceLineNumber sourceLineNumbers, string modulePath, string message)
+        {
+            return Message(sourceLineNumbers, Ids.UnableToOpenModule, "Unable to open merge module '{0}'. Check to make sure the module language is correct. '{1}'", modulePath, message);
+        }
+
+        public static Message UnexpectedCustomTableColumn(SourceLineNumber sourceLineNumbers, string column)
+        {
+            return Message(sourceLineNumbers, Ids.UnexpectedCustomTableColumn, "The custom table column '{0}' is unknown.", column);
+        }
+
+        public static Message UnexpectedTableInMergeModule(SourceLineNumber sourceLineNumbers, string tableName)
+        {
+            return Message(sourceLineNumbers, Ids.UnexpectedTableInMergeModule, "An unexpected row in the '{0}' table was found in this merge module. Merge modules cannot contain the '{0}' table.", tableName);
+        }
+
+        public static Message UnexpectedTableInPatch(SourceLineNumber sourceLineNumbers, string tableName)
+        {
+            return Message(sourceLineNumbers, Ids.UnexpectedTableInPatch, "An unexpected row in the '{0}' table was found in this patch. Patches cannot contain the '{0}' table.", tableName);
+        }
+
+        public static Message ValidationError(SourceLineNumber sourceLineNumbers, string ice, string message)
+        {
+            return Message(sourceLineNumbers, Ids.ValidationError, "{0}: {1}", ice, message);
+        }
+
+        public static Message WixFileNotFound(string file)
+        {
+            return Message(null, Ids.WixFileNotFound, "The file '{0}' cannot be found.", file);
+        }
+
         private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
         {
             return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args);
@@ -61,8 +496,93 @@ namespace WixToolset.Core.WindowsInstaller
 
         public enum Ids
         {
+            CabExtractionFailed = 17,
+            NoDataForColumn = 53,
+            CabFileDoesNotExist = 76,
+            CannotFindFile = 83,
+            BinderFileManagerMissingFile = 84,
+            DuplicateModuleFileIdentifier = 97,
+            DuplicateModuleCaseInsensitiveFileIdentifier = 98,
+            DuplicateExtensionTable = 126,
+            CannotOpenMergeModule = 129,
+            FileIdentifierNotFound = 131,
+            InvalidAssemblyFile = 132,
+            ExpectedMediaCabinet = 135,
+            UnexpectedCustomTableColumn = 165,
+            OverridableActionCollision = 168,
+            OverridableActionCollision2 = 169,
+            ActionCollision = 170,
+            ActionCollision2 = 171,
+            SuppressNonoverridableAction = 172,
+            SuppressNonoverridableAction2 = 173,
+            CustomActionSequencedInModule = 174,
+            StandardActionRelativelyScheduledInModule = 175,
+            ActionCircularDependency = 176,
+            ActionScheduledRelativeToTerminationAction = 177,
+            ActionScheduledRelativeToTerminationAction2 = 178,
+            NoUniqueActionSequenceNumber = 179,
+            NoUniqueActionSequenceNumber2 = 180,
+            UnexpectedTableInMergeModule = 184,
+            MergeExcludedModule = 186,
+            MergeFeatureRequired = 187,
+            MergeLanguageFailed = 188,
+            MergeLanguageUnsupported = 189,
+            InvalidMergeLanguage = 194,
+            ValidationError = 204,
+            InvalidKeyColumn = 220,
             OpenDatabaseFailed = 223,
-
+            OutputTypeMismatch = 224,
+            NoDifferencesInTransform = 227,
+            OutputCodepageMismatch = 228,
+            OutputCodepageMismatch2 = 229,
+            IllegalPathForGeneratedComponentGuid = 231,
+            InvalidManifestContent = 238,
+            UnexpectedTableInPatch = 241,
+            InvalidKeypathChange = 243,
+            PatchWithoutTransforms = 246,
+            PatchWithoutValidTransforms = 252,
+            ExpectedPatchIdInWixMsp = 256,
+            ExpectedMediaRowsInWixMsp = 257,
+            WixFileNotFound = 258,
+            ExpectedClientPatchIdInWixMsp = 259,
+            NewRowAddedInTable = 260,
+            PatchNotRemovable = 261,
+            FileTooLarge = 263,
+            ProductCodeInvalidForTransform = 269,
+            InsertInvalidSequenceActionOrder = 270,
+            InsertSequenceNoSpace = 271,
+            MissingManifestForWin32Assembly = 272,
+            UnableToOpenModule = 273,
+            TransformSchemaMismatch = 278,
+            DatabaseSchemaMismatch = 279,
+            GacAssemblyNoStrongName = 282,
+            DuplicateCabinetName = 290,
+            DuplicateCabinetName2 = 291,
+            InvalidAddedFileRowWithoutSequence = 292,
+            CreateCabAddFileFailed = 296,
+            CreateCabInsufficientDiskSpace = 297,
+            GACAssemblyIdentityWarning = 299,
+            InvalidRemoveComponent = 305,
+            InvalidStringForCodepage = 311,
+            SameFileIdDifferentSource = 317,
+            BothUpgradeCodesRequired = 322,
+            UnableToGetAuthenticodeCertOfFile = 327,
+            UnableToGetAuthenticodeCertOfFileDownlevelOS = 328,
+            ReadOnlyOutputFile = 329,
+            MergePlatformMismatch = 345,
+            MediaTableCollision = 357,
+            MaximumUncompressedMediaSizeTooLarge = 359,
+            MissingOrInvalidModuleInstallerVersion = 366,
+            IllegalGeneratedGuidComponentUnversionedKeypath = 367,
+            IllegalGeneratedGuidComponentVersionedNonkeypath = 368,
+            DuplicateComponentGuids = 369,
+            MaximumCabinetSizeForLargeFileSplittingTooLarge = 375,
+            SplitCabinetCopyRegistrationFailed = 376,
+            MissingMedia = 382,
+            TooManyColumnsInRealTable = 386,
+            CouldNotDetermineProductCodeFromTransformSummaryInfo = 394,
+            IntermediatesMustBeResolved = 396,
+            OverlengthTableNameInProductOrMergeModule = 415,
             CannotLoadWixoutAsTransform = 7500,
             InvalidModuleVersion = 7501,
             ExceededMaximumAllowedComponentsInMsi = 7502,
diff --git a/src/wix/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs b/src/wix/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
index 4ad8f764..96bedcb9 100644
--- a/src/wix/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
+++ b/src/wix/WixToolset.Core/Bind/ResolveDelayedFieldsCommand.cs
@@ -6,6 +6,7 @@ namespace WixToolset.Core.Bind
     using System.Collections.Generic;
     using System.Globalization;
     using System.Text;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
@@ -148,7 +149,7 @@ namespace WixToolset.Core.Bind
                     }
                     else
                     {
-                        this.Messaging.Write(ErrorMessages.UnresolvedBindReference(sourceLineNumbers, value));
+                        this.Messaging.Write(CoreErrors.UnresolvedBindReference(sourceLineNumbers, value));
                         break;
                     }
                 }
diff --git a/src/wix/WixToolset.Core/Bind/TransferFilesCommand.cs b/src/wix/WixToolset.Core/Bind/TransferFilesCommand.cs
index 28ca6b49..e1ee0ef2 100644
--- a/src/wix/WixToolset.Core/Bind/TransferFilesCommand.cs
+++ b/src/wix/WixToolset.Core/Bind/TransferFilesCommand.cs
@@ -6,6 +6,7 @@ namespace WixToolset.Core.Bind
     using System.Collections.Generic;
     using System.IO;
     using System.Security.AccessControl;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
@@ -101,7 +102,7 @@ namespace WixToolset.Core.Bind
                             }
                             catch (ArgumentException) // thrown for unauthorized access errors
                             {
-                                throw new WixException(ErrorMessages.UnauthorizedAccess(fileTransfer.Destination));
+                                throw new WixException(CoreErrors.UnauthorizedAccess(fileTransfer.Destination));
                             }
 
                             // try to delete the file
@@ -111,7 +112,7 @@ namespace WixToolset.Core.Bind
                             }
                             catch (IOException)
                             {
-                                throw new WixException(ErrorMessages.FileInUse(null, fileTransfer.Destination));
+                                throw new WixException(CoreErrors.FileInUse(null, fileTransfer.Destination));
                             }
 
                             retry = true;
@@ -142,7 +143,7 @@ namespace WixToolset.Core.Bind
                             }
                             catch (IOException)
                             {
-                                throw new WixException(ErrorMessages.FileInUse(null, fileTransfer.Destination));
+                                throw new WixException(CoreErrors.FileInUse(null, fileTransfer.Destination));
                             }
 
                             retry = true;
diff --git a/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs b/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
index d45b9301..4883932a 100644
--- a/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
+++ b/src/wix/WixToolset.Core/CommandLine/BuildCommand.cs
@@ -9,6 +9,7 @@ namespace WixToolset.Core.CommandLine
     using System.Threading;
     using System.Threading.Tasks;
     using System.Xml.Linq;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
@@ -836,7 +837,7 @@ namespace WixToolset.Core.CommandLine
 
                     if (variables.ContainsKey(value[0]))
                     {
-                        this.Messaging.Write(ErrorMessages.DuplicateVariableDefinition(value[0], (1 == value.Length) ? String.Empty : value[1], variables[value[0]]));
+                        this.Messaging.Write(CoreErrors.DuplicateVariableDefinition(value[0], (1 == value.Length) ? String.Empty : value[1], variables[value[0]]));
                         continue;
                     }
 
@@ -903,12 +904,12 @@ namespace WixToolset.Core.CommandLine
                 {
                     if (wixipls.Count > 1 || codePaths.Count > 0 || libraryPaths.Count > 0)
                     {
-                        this.Messaging.Write(ErrorMessages.WixiplSourceFileIsExclusive());
+                        this.Messaging.Write(CoreErrors.WixiplSourceFileIsExclusive());
                     }
                 }
                 else if (codePaths.Count == 0 && libraryPaths.Count == 0)
                 {
-                    this.Messaging.Write(ErrorMessages.NoSourceFiles());
+                    this.Messaging.Write(CoreErrors.NoSourceFiles());
                 }
 
                 if (!this.Messaging.EncounteredError && String.IsNullOrEmpty(outputPath))
@@ -917,7 +918,7 @@ namespace WixToolset.Core.CommandLine
 
                     if (String.IsNullOrEmpty(singleInputPath))
                     {
-                        this.Messaging.Write(ErrorMessages.MustSpecifyOutputWithMoreThanOneInput());
+                        this.Messaging.Write(CoreErrors.MustSpecifyOutputWithMoreThanOneInput());
                     }
                     else
                     {
@@ -947,7 +948,7 @@ namespace WixToolset.Core.CommandLine
 
                 if (File.Exists(bp.Path))
                 {
-                    this.Messaging.Write(ErrorMessages.ExpectedDirectoryGotFile(argument, bp.Path));
+                    this.Messaging.Write(CoreErrors.ExpectedDirectoryGotFile(argument, bp.Path));
                     return false;
                 }
 
diff --git a/src/wix/WixToolset.Core/CommandLine/CommandLine.cs b/src/wix/WixToolset.Core/CommandLine/CommandLine.cs
index d6e0e0ae..eff693c1 100644
--- a/src/wix/WixToolset.Core/CommandLine/CommandLine.cs
+++ b/src/wix/WixToolset.Core/CommandLine/CommandLine.cs
@@ -4,7 +4,7 @@ namespace WixToolset.Core.CommandLine
 {
     using System;
     using System.Collections.Generic;
-    using WixToolset.Data;
+    using WixToolset.Core;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
@@ -252,7 +252,7 @@ namespace WixToolset.Core.CommandLine
             }
             else
             {
-                parser.ReportErrorArgument(parameter, ErrorMessages.IllegalSuppressWarningId(paramArg));
+                parser.ReportErrorArgument(parameter, CoreErrors.IllegalSuppressWarningId(paramArg));
             }
         }
 
@@ -269,7 +269,7 @@ namespace WixToolset.Core.CommandLine
             }
             else
             {
-                parser.ReportErrorArgument(parameter, ErrorMessages.IllegalWarningIdAsError(paramArg));
+                parser.ReportErrorArgument(parameter, CoreErrors.IllegalWarningIdAsError(paramArg));
             }
         }
     }
diff --git a/src/wix/WixToolset.Core/CommandLine/CommandLineParser.cs b/src/wix/WixToolset.Core/CommandLine/CommandLineParser.cs
index ed0936a8..0e56fe4f 100644
--- a/src/wix/WixToolset.Core/CommandLine/CommandLineParser.cs
+++ b/src/wix/WixToolset.Core/CommandLine/CommandLineParser.cs
@@ -6,6 +6,7 @@ namespace WixToolset.Core.CommandLine
     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility.Services;
 
@@ -61,7 +62,7 @@ namespace WixToolset.Core.CommandLine
                 return argument;
             }
 
-            this.Messaging.Write(ErrorMessages.ExpectedArgument(commandLineSwitch));
+            this.Messaging.Write(CoreErrors.ExpectedArgument(commandLineSwitch));
             return null;
         }
 
@@ -73,7 +74,7 @@ namespace WixToolset.Core.CommandLine
                 return true;
             }
 
-            this.Messaging.Write(ErrorMessages.ExpectedArgument(commandLineSwitch));
+            this.Messaging.Write(CoreErrors.ExpectedArgument(commandLineSwitch));
             return false;
         }
 
@@ -84,7 +85,7 @@ namespace WixToolset.Core.CommandLine
                 return directory;
             }
 
-            this.Messaging.Write(ErrorMessages.ExpectedArgument(commandLineSwitch));
+            this.Messaging.Write(CoreErrors.ExpectedArgument(commandLineSwitch));
             return null;
         }
 
@@ -96,7 +97,7 @@ namespace WixToolset.Core.CommandLine
                 return true;
             }
 
-            this.Messaging.Write(ErrorMessages.ExpectedArgument(commandLineSwitch));
+            this.Messaging.Write(CoreErrors.ExpectedArgument(commandLineSwitch));
             return false;
         }
 
@@ -107,7 +108,7 @@ namespace WixToolset.Core.CommandLine
                 return path;
             }
 
-            this.Messaging.Write(ErrorMessages.ExpectedArgument(commandLineSwitch));
+            this.Messaging.Write(CoreErrors.ExpectedArgument(commandLineSwitch));
             return null;
         }
 
@@ -123,13 +124,13 @@ namespace WixToolset.Core.CommandLine
                 return true;
             }
 
-            this.Messaging.Write(ErrorMessages.ExpectedArgument(commandLineSwitch));
+            this.Messaging.Write(CoreErrors.ExpectedArgument(commandLineSwitch));
             return false;
         }
 
         public void ReportErrorArgument(string argument, Message message = null)
         {
-            this.Messaging.Write(message ?? ErrorMessages.AdditionalArgumentUnexpected(argument));
+            this.Messaging.Write(message ?? CoreErrors.AdditionalArgumentUnexpected(argument));
             this.ErrorArgument = argument;
         }
 
@@ -181,7 +182,7 @@ namespace WixToolset.Core.CommandLine
 
             if (File.Exists(arg))
             {
-                this.Messaging.Write(ErrorMessages.ExpectedDirectoryGotFile(commandlineSwitch, arg));
+                this.Messaging.Write(CoreErrors.ExpectedDirectoryGotFile(commandlineSwitch, arg));
                 return false;
             }
 
@@ -199,7 +200,7 @@ namespace WixToolset.Core.CommandLine
             }
             else if (Directory.Exists(arg))
             {
-                this.Messaging.Write(ErrorMessages.ExpectedFileGotDirectory(commandlineSwitch, arg));
+                this.Messaging.Write(CoreErrors.ExpectedFileGotDirectory(commandlineSwitch, arg));
             }
             else
             {
@@ -272,7 +273,7 @@ namespace WixToolset.Core.CommandLine
 
             if (0 <= path.IndexOf('\"'))
             {
-                this.Messaging.Write(ErrorMessages.PathCannotContainQuote(path));
+                this.Messaging.Write(CoreErrors.PathCannotContainQuote(path));
                 return null;
             }
 
@@ -282,7 +283,7 @@ namespace WixToolset.Core.CommandLine
             }
             catch (Exception e)
             {
-                this.Messaging.Write(ErrorMessages.InvalidCommandLineFileName(path, e.Message));
+                this.Messaging.Write(CoreErrors.InvalidCommandLineFileName(path, e.Message));
                 return null;
             }
 
diff --git a/src/wix/WixToolset.Core/Common.cs b/src/wix/WixToolset.Core/Common.cs
index b1821195..b4b734c8 100644
--- a/src/wix/WixToolset.Core/Common.cs
+++ b/src/wix/WixToolset.Core/Common.cs
@@ -5,7 +5,6 @@ namespace WixToolset.Core
     using System;
     using System.Diagnostics;
     using System.Globalization;
-    using System.IO;
     using System.Linq;
     using System.Security.Cryptography;
     using System.Text;
@@ -76,7 +75,7 @@ namespace WixToolset.Core
                     codePage = encoding.CodePage;
                     if (0 > codePage || Int16.MaxValue < codePage)
                     {
-                        throw new WixException(ErrorMessages.InvalidSummaryInfoCodePage(sourceLineNumbers, codePage));
+                        throw new WixException(CoreErrors.InvalidSummaryInfoCodePage(sourceLineNumbers, codePage));
                     }
                 }
 
@@ -593,7 +592,7 @@ namespace WixToolset.Core
             {
                 if (value.StartsWith("[", StringComparison.Ordinal) && value.EndsWith("]", StringComparison.Ordinal))
                 {
-                    messaging.Write(ErrorMessages.IllegalIdentifierLooksLikeFormatted(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                    messaging.Write(CoreErrors.IllegalIdentifierLooksLikeFormatted(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
                 }
                 else
                 {
@@ -717,11 +716,11 @@ namespace WixToolset.Core
                 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(element);
                 if (attributeName == null)
                 {
-                    messaging.Write(ErrorMessages.IllegalInnerText(sourceLineNumbers, element.Name.LocalName, innerText));
+                    messaging.Write(CoreErrors.IllegalInnerText(sourceLineNumbers, element.Name.LocalName, innerText));
                 }
                 else
                 {
-                    messaging.Write(ErrorMessages.IllegalInnerText(sourceLineNumbers, element.Name.LocalName, innerText, attributeName));
+                    messaging.Write(CoreErrors.IllegalInnerText(sourceLineNumbers, element.Name.LocalName, innerText, attributeName));
                 }
             }
         }
@@ -834,7 +833,7 @@ namespace WixToolset.Core
             if (!((String.IsNullOrEmpty(extensionAttribute.Name.NamespaceName) && extensionAttribute.Name.LocalName.Equals("xmlns", StringComparison.Ordinal)) ||
                    extensionAttribute.Name.NamespaceName.StartsWith(CompilerCore.W3SchemaPrefix.NamespaceName, StringComparison.Ordinal)))
             {
-                messaging.Write(ErrorMessages.UnsupportedExtensionAttribute(sourceLineNumbers, extensionAttribute.Parent.Name.LocalName, extensionAttribute.Name.LocalName));
+                messaging.Write(CoreErrors.UnsupportedExtensionAttribute(sourceLineNumbers, extensionAttribute.Parent.Name.LocalName, extensionAttribute.Name.LocalName));
             }
         }
 
diff --git a/src/wix/WixToolset.Core/Compile/CompilerPackagePayload.cs b/src/wix/WixToolset.Core/Compile/CompilerPackagePayload.cs
index 6b95de5f..4f8d5fe2 100644
--- a/src/wix/WixToolset.Core/Compile/CompilerPackagePayload.cs
+++ b/src/wix/WixToolset.Core/Compile/CompilerPackagePayload.cs
@@ -3,8 +3,6 @@
 namespace WixToolset.Core
 {
     using System;
-    using System.Collections.Generic;
-    using System.Text;
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
diff --git a/src/wix/WixToolset.Core/Compiler.cs b/src/wix/WixToolset.Core/Compiler.cs
index 3a703fb7..82ab0e1e 100644
--- a/src/wix/WixToolset.Core/Compiler.cs
+++ b/src/wix/WixToolset.Core/Compiler.cs
@@ -108,7 +108,7 @@ namespace WixToolset.Core
                 }
                 else
                 {
-                    this.Messaging.Write(ErrorMessages.DuplicateExtensionXmlSchemaNamespace(extension.GetType().ToString(), extension.Namespace.NamespaceName, collidingExtension.GetType().ToString()));
+                    this.Messaging.Write(CoreErrors.DuplicateExtensionXmlSchemaNamespace(extension.GetType().ToString(), extension.Namespace.NamespaceName, collidingExtension.GetType().ToString()));
                 }
 
                 extension.PreCompile(this.Context);
@@ -330,7 +330,7 @@ namespace WixToolset.Core
             {
                 if (propertyId.Id != propertyId.Id.ToUpperInvariant())
                 {
-                    this.Core.Write(ErrorMessages.SearchPropertyNotUppercase(sourceLineNumbers, "Property", "Id", propertyId.Id));
+                    this.Core.Write(CoreErrors.SearchPropertyNotUppercase(sourceLineNumbers, "Property", "Id", propertyId.Id));
                 }
 
                 this.Core.AddSymbol(new AppSearchSymbol(sourceLineNumbers, new Identifier(propertyId.Access, propertyId.Id, signature))
@@ -413,7 +413,7 @@ namespace WixToolset.Core
         {
             if (secure && property.Id != property.Id.ToUpperInvariant())
             {
-                this.Core.Write(ErrorMessages.SecurePropertyNotUppercase(sourceLineNumbers, "Property", "Id", property.Id));
+                this.Core.Write(CoreErrors.SecurePropertyNotUppercase(sourceLineNumbers, "Property", "Id", property.Id));
             }
 
             if (null == section)
@@ -517,7 +517,7 @@ namespace WixToolset.Core
 
             if ((YesNoType.No == advertise && YesNoType.Yes == appIdAdvertise) || (YesNoType.Yes == advertise && YesNoType.No == appIdAdvertise))
             {
-                this.Core.Write(ErrorMessages.AppIdIncompatibleAdvertiseState(sourceLineNumbers, node.Name.LocalName, "Advertise", appIdAdvertise.ToString(), advertise.ToString()));
+                this.Core.Write(CoreErrors.AppIdIncompatibleAdvertiseState(sourceLineNumbers, node.Name.LocalName, "Advertise", appIdAdvertise.ToString(), advertise.ToString()));
             }
             else if (appIdAdvertise != YesNoType.NotSet)
             {
@@ -554,7 +554,7 @@ namespace WixToolset.Core
             {
                 if (null != description)
                 {
-                    this.Core.Write(ErrorMessages.IllegalAttributeWhenAdvertised(sourceLineNumbers, node.Name.LocalName, "Description"));
+                    this.Core.Write(CoreErrors.IllegalAttributeWhenAdvertised(sourceLineNumbers, node.Name.LocalName, "Description"));
                 }
 
                 if (!this.Core.EncounteredError)
@@ -1142,7 +1142,7 @@ namespace WixToolset.Core
             {
                 if (uniqueContexts.Contains(context))
                 {
-                    this.Core.Write(ErrorMessages.DuplicateContextValue(sourceLineNumbers, context));
+                    this.Core.Write(CoreErrors.DuplicateContextValue(sourceLineNumbers, context));
                 }
                 else
                 {
@@ -1161,7 +1161,7 @@ namespace WixToolset.Core
 
             if ((YesNoType.No == advertise && YesNoType.Yes == classAdvertise) || (YesNoType.Yes == advertise && YesNoType.No == classAdvertise))
             {
-                this.Core.Write(ErrorMessages.AdvertiseStateMustMatch(sourceLineNumbers, classAdvertise.ToString(), advertise.ToString()));
+                this.Core.Write(CoreErrors.AdvertiseStateMustMatch(sourceLineNumbers, classAdvertise.ToString(), advertise.ToString()));
             }
             else
             {
@@ -1412,7 +1412,7 @@ namespace WixToolset.Core
 
                 if (YesNoType.NotSet != relativePath) // ClassId's RelativePath
                 {
-                    this.Core.Write(ErrorMessages.RelativePathForRegistryElement(sourceLineNumbers));
+                    this.Core.Write(CoreErrors.RelativePathForRegistryElement(sourceLineNumbers));
                 }
             }
 
@@ -1626,7 +1626,7 @@ namespace WixToolset.Core
             {
                 if (mask.Length != value.Length)
                 {
-                    this.Core.Write(ErrorMessages.ValueAndMaskMustBeSameLength(sourceLineNumbers));
+                    this.Core.Write(CoreErrors.ValueAndMaskMustBeSameLength(sourceLineNumbers));
                 }
                 cb = mask.Length / 2;
             }
@@ -1827,7 +1827,7 @@ namespace WixToolset.Core
                         case "DirectorySearch":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
 
@@ -1837,7 +1837,7 @@ namespace WixToolset.Core
                         case "DirectorySearchRef":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseDirectorySearchRefElement(child, id.Id);
@@ -1845,7 +1845,7 @@ namespace WixToolset.Core
                         case "FileSearch":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseFileSearchElement(child, id.Id, false, CompilerConstants.IntegerNotSet);
@@ -1854,7 +1854,7 @@ namespace WixToolset.Core
                         case "FileSearchRef":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             var newId = this.ParseSimpleRefElement(child, SymbolDefinitions.Signature); // FileSearch signatures override parent signatures
@@ -2009,7 +2009,7 @@ namespace WixToolset.Core
                         case "DirectorySearch":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseDirectorySearchElement(child, "CCP_DRIVE");
@@ -2017,7 +2017,7 @@ namespace WixToolset.Core
                         case "DirectorySearchRef":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseDirectorySearchRefElement(child, "CCP_DRIVE");
@@ -2035,7 +2035,7 @@ namespace WixToolset.Core
 
             if (null == signature)
             {
-                this.Core.Write(ErrorMessages.SearchElementRequired(sourceLineNumbers, node.Name.LocalName));
+                this.Core.Write(CoreErrors.SearchElementRequired(sourceLineNumbers, node.Name.LocalName));
             }
 
             return signature;
@@ -2081,13 +2081,13 @@ namespace WixToolset.Core
                 else if (signature != sig)
                 {
                     // all signatures under a ComplianceCheck must be the same
-                    this.Core.Write(ErrorMessages.MultipleIdentifiersFound(sourceLineNumbers, node.Name.LocalName, sig, signature));
+                    this.Core.Write(CoreErrors.MultipleIdentifiersFound(sourceLineNumbers, node.Name.LocalName, sig, signature));
                 }
             }
 
             if (null == signature)
             {
-                this.Core.Write(ErrorMessages.SearchElementRequired(sourceLineNumbers, node.Name.LocalName));
+                this.Core.Write(CoreErrors.SearchElementRequired(sourceLineNumbers, node.Name.LocalName));
             }
 
             if (!this.Core.EncounteredError)
@@ -2280,7 +2280,7 @@ namespace WixToolset.Core
             {
                 if (this.compilingModule)
                 {
-                    this.Core.Write(ErrorMessages.IllegalAttributeInMergeModule(sourceLineNumbers, node.Name.LocalName, "Feature"));
+                    this.Core.Write(CoreErrors.IllegalAttributeInMergeModule(sourceLineNumbers, node.Name.LocalName, "Feature"));
                 }
                 else
                 {
@@ -2466,7 +2466,7 @@ namespace WixToolset.Core
 
                 if (keyFound && YesNoType.Yes == keyPathSet)
                 {
-                    this.Core.Write(ErrorMessages.ComponentMultipleKeyPaths(sourceLineNumbers, node.Name.LocalName, "KeyPath", "yes", "File", "RegistryValue", "ODBCDataSource"));
+                    this.Core.Write(CoreErrors.ComponentMultipleKeyPaths(sourceLineNumbers, node.Name.LocalName, "KeyPath", "yes", "File", "RegistryValue", "ODBCDataSource"));
                 }
 
                 // if a possible KeyPath has been found and that value was explicitly set as
@@ -2503,7 +2503,7 @@ namespace WixToolset.Core
             // Check for implicit KeyPath which can easily be accidentally changed
             if (this.ShowPedanticMessages && !keyFound && !allowImplicitIds)
             {
-                this.Core.Write(ErrorMessages.ImplicitComponentKeyPath(sourceLineNumbers, id.Id));
+                this.Core.Write(CoreErrors.ImplicitComponentKeyPath(sourceLineNumbers, id.Id));
             }
 
             // If there isn't an @Id attribute value, replace the placeholder with the id of the keypath.
@@ -2519,7 +2519,7 @@ namespace WixToolset.Core
                 }
                 else
                 {
-                    this.Core.Write(ErrorMessages.CannotDefaultComponentId(sourceLineNumbers));
+                    this.Core.Write(CoreErrors.CannotDefaultComponentId(sourceLineNumbers));
                 }
             }
 
@@ -2852,7 +2852,7 @@ namespace WixToolset.Core
                         case "DirectorySearch":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
 
@@ -2862,7 +2862,7 @@ namespace WixToolset.Core
                         case "DirectorySearchRef":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseDirectorySearchRefElement(child, id.Id);
@@ -2870,7 +2870,7 @@ namespace WixToolset.Core
                         case "FileSearch":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseFileSearchElement(child, id.Id, false, CompilerConstants.IntegerNotSet);
@@ -2879,7 +2879,7 @@ namespace WixToolset.Core
                         case "FileSearchRef":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             var newId = this.ParseSimpleRefElement(child, SymbolDefinitions.Signature); // FileSearch signatures override parent signatures
@@ -3209,7 +3209,7 @@ namespace WixToolset.Core
                         case "BinaryRef":
                             if (null != source)
                             {
-                                this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script"));
+                                this.Core.Write(CoreErrors.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script"));
                             }
                             source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                             sourceType = CustomActionSourceType.Binary;
@@ -3238,7 +3238,7 @@ namespace WixToolset.Core
                         case "Directory":
                             if (null != source)
                             {
-                                this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryKey", "Directory", "FileRef", "Property", "Script"));
+                                this.Core.Write(CoreErrors.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryKey", "Directory", "FileRef", "Property", "Script"));
                             }
                             source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                             sourceType = CustomActionSourceType.Directory;
@@ -3247,7 +3247,7 @@ namespace WixToolset.Core
                         case "DllEntry":
                             if (null != target)
                             {
-                                this.Core.Write(ErrorMessages.CustomActionMultipleTargets(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "DllEntry", "Error", "ExeCommand", "JScriptCall", "Script", "Value", "VBScriptCall"));
+                                this.Core.Write(CoreErrors.CustomActionMultipleTargets(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "DllEntry", "Error", "ExeCommand", "JScriptCall", "Script", "Value", "VBScriptCall"));
                             }
                             target = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                             targetType = CustomActionTargetType.Dll;
@@ -3255,7 +3255,7 @@ namespace WixToolset.Core
                         case "Error":
                             if (null != target)
                             {
-                                this.Core.Write(ErrorMessages.CustomActionMultipleTargets(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "DllEntry", "Error", "ExeCommand", "JScriptCall", "Script", "Value", "VBScriptCall"));
+                                this.Core.Write(CoreErrors.CustomActionMultipleTargets(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "DllEntry", "Error", "ExeCommand", "JScriptCall", "Script", "Value", "VBScriptCall"));
                             }
                             target = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                             sourceType = CustomActionSourceType.File;
@@ -3272,7 +3272,7 @@ namespace WixToolset.Core
                         case "ExeCommand":
                             if (null != target)
                             {
-                                this.Core.Write(ErrorMessages.CustomActionMultipleTargets(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "DllEntry", "Error", "ExeCommand", "JScriptCall", "Script", "Value", "VBScriptCall"));
+                                this.Core.Write(CoreErrors.CustomActionMultipleTargets(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "DllEntry", "Error", "ExeCommand", "JScriptCall", "Script", "Value", "VBScriptCall"));
                             }
                             target = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty); // one of the few cases where an empty string value is valid
                             targetType = CustomActionTargetType.Exe;
@@ -3310,7 +3310,7 @@ namespace WixToolset.Core
                         case "FileRef":
                             if (null != source)
                             {
-                                this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script"));
+                                this.Core.Write(CoreErrors.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script"));
                             }
                             source = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                             sourceType = CustomActionSourceType.File;
@@ -3325,7 +3325,7 @@ namespace WixToolset.Core
                         case "JScriptCall":
                             if (null != target)
                             {
-                                this.Core.Write(ErrorMessages.CustomActionMultipleTargets(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "DllEntry", "Error", "ExeCommand", "JScriptCall", "Script", "Value", "VBScriptCall"));
+                                this.Core.Write(CoreErrors.CustomActionMultipleTargets(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "DllEntry", "Error", "ExeCommand", "JScriptCall", "Script", "Value", "VBScriptCall"));
                             }
                             target = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty); // one of the few cases where an empty string value is valid
                             targetType = CustomActionTargetType.JScript;
@@ -3336,7 +3336,7 @@ namespace WixToolset.Core
                         case "Property":
                             if (null != source)
                             {
-                                this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script"));
+                                this.Core.Write(CoreErrors.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script"));
                             }
                             source = this.Core.GetAttributeValue(sourceLineNumbers, attrib);
                             sourceType = CustomActionSourceType.Property;
@@ -3367,12 +3367,12 @@ namespace WixToolset.Core
                         case "Script":
                             if (null != source)
                             {
-                                this.Core.Write(ErrorMessages.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script"));
+                                this.Core.Write(CoreErrors.CustomActionMultipleSources(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "BinaryRef", "Directory", "FileRef", "Property", "Script"));
                             }
 
                             if (null != target)
                             {
-                                this.Core.Write(ErrorMessages.CustomActionMultipleTargets(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "DllEntry", "Error", "ExeCommand", "JScriptCall", "Script", "Value", "VBScriptCall"));
+                                this.Core.Write(CoreErrors.CustomActionMultipleTargets(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "DllEntry", "Error", "ExeCommand", "JScriptCall", "Script", "Value", "VBScriptCall"));
                             }
 
                             // set the source and target to empty string for error messages when the user sets multiple sources or targets
@@ -3414,7 +3414,7 @@ namespace WixToolset.Core
                         case "Value":
                             if (null != target)
                             {
-                                this.Core.Write(ErrorMessages.CustomActionMultipleTargets(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "DllEntry", "Error", "ExeCommand", "JScriptCall", "Script", "Value", "VBScriptCall"));
+                                this.Core.Write(CoreErrors.CustomActionMultipleTargets(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "DllEntry", "Error", "ExeCommand", "JScriptCall", "Script", "Value", "VBScriptCall"));
                             }
                             target = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty); // one of the few cases where an empty string value is valid
                             targetType = CustomActionTargetType.TextData;
@@ -3422,7 +3422,7 @@ namespace WixToolset.Core
                         case "VBScriptCall":
                             if (null != target)
                             {
-                                this.Core.Write(ErrorMessages.CustomActionMultipleTargets(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "DllEntry", "Error", "ExeCommand", "JScriptCall", "Script", "Value", "VBScriptCall"));
+                                this.Core.Write(CoreErrors.CustomActionMultipleTargets(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "DllEntry", "Error", "ExeCommand", "JScriptCall", "Script", "Value", "VBScriptCall"));
                             }
                             target = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty); // one of the few cases where an empty string value is valid
                             targetType = CustomActionTargetType.VBScript;
@@ -3529,7 +3529,7 @@ namespace WixToolset.Core
                 CustomActionExecutionType.Rollback != executionType &&
                 CustomActionExecutionType.Commit != executionType)
             {
-                this.Core.Write(ErrorMessages.IllegalTerminalServerCustomActionAttributes(sourceLineNumbers));
+                this.Core.Write(CoreErrors.IllegalTerminalServerCustomActionAttributes(sourceLineNumbers));
             }
 
             // MSI doesn't support in-script property setting, so disallow it
@@ -3539,7 +3539,7 @@ namespace WixToolset.Core
                  CustomActionExecutionType.Rollback == executionType ||
                  CustomActionExecutionType.Commit == executionType))
             {
-                this.Core.Write(ErrorMessages.IllegalPropertyCustomActionAttributes(sourceLineNumbers));
+                this.Core.Write(CoreErrors.IllegalPropertyCustomActionAttributes(sourceLineNumbers));
             }
 
             if (!targetType.HasValue)
@@ -3710,7 +3710,7 @@ namespace WixToolset.Core
             }
             else if (31 < id.Length)
             {
-                this.Core.Write(ErrorMessages.TableNameTooLong(sourceLineNumbers, node.Name.LocalName, "Id", id));
+                this.Core.Write(CoreErrors.TableNameTooLong(sourceLineNumbers, node.Name.LocalName, "Id", id));
             }
 
             this.Core.ParseForExtensionElements(node);
@@ -3852,7 +3852,7 @@ namespace WixToolset.Core
 
                 if (id.Id == "TARGETDIR" && name != "SourceDir" && shortName == null && shortSourceName == null && sourceName == null)
                 {
-                    this.Core.Write(ErrorMessages.IllegalTargetDirDefaultDir(sourceLineNumbers, name));
+                    this.Core.Write(CoreErrors.IllegalTargetDirDefaultDir(sourceLineNumbers, name));
                 }
             }
 
@@ -4091,7 +4091,7 @@ namespace WixToolset.Core
                         case "DirectorySearch":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseDirectorySearchElement(child, id.Id);
@@ -4099,7 +4099,7 @@ namespace WixToolset.Core
                         case "DirectorySearchRef":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseDirectorySearchRefElement(child, id.Id);
@@ -4107,7 +4107,7 @@ namespace WixToolset.Core
                         case "FileSearch":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             hasFileSearch = true;
@@ -4116,7 +4116,7 @@ namespace WixToolset.Core
                         case "FileSearchRef":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseSimpleRefElement(child, SymbolDefinitions.Signature);
@@ -4223,7 +4223,7 @@ namespace WixToolset.Core
             {
                 if (!String.IsNullOrEmpty(parentSignature))
                 {
-                    this.Core.Write(ErrorMessages.CanNotHaveTwoParents(sourceLineNumbers, id.Id, parent.Id, parentSignature));
+                    this.Core.Write(CoreErrors.CanNotHaveTwoParents(sourceLineNumbers, id.Id, parent.Id, parentSignature));
                 }
                 else
                 {
@@ -4249,7 +4249,7 @@ namespace WixToolset.Core
                         case "DirectorySearch":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseDirectorySearchElement(child, id.Id);
@@ -4257,7 +4257,7 @@ namespace WixToolset.Core
                         case "DirectorySearchRef":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseDirectorySearchRefElement(child, id.Id);
@@ -4265,7 +4265,7 @@ namespace WixToolset.Core
                         case "FileSearch":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseFileSearchElement(child, id.Id, false, CompilerConstants.IntegerNotSet);
@@ -4273,7 +4273,7 @@ namespace WixToolset.Core
                         case "FileSearchRef":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseSimpleRefElement(child, SymbolDefinitions.Signature);
@@ -4350,7 +4350,7 @@ namespace WixToolset.Core
                                 case "followParent":
                                     if (ComplexReferenceParentType.Product == parentType)
                                     {
-                                        this.Core.Write(ErrorMessages.RootFeatureCannotFollowParent(sourceLineNumbers));
+                                        this.Core.Write(CoreErrors.RootFeatureCannotFollowParent(sourceLineNumbers));
                                     }
                                     //bits = bits | MsiInterop.MsidbFeatureAttributesFollowParent;
                                     installDefault = FeatureInstallDefault.FollowParent;
@@ -4413,17 +4413,17 @@ namespace WixToolset.Core
             }
             else if (38 < id.Id.Length)
             {
-                this.Core.Write(ErrorMessages.FeatureNameTooLong(sourceLineNumbers, node.Name.LocalName, "Id", id.Id));
+                this.Core.Write(CoreErrors.FeatureNameTooLong(sourceLineNumbers, node.Name.LocalName, "Id", id.Id));
             }
 
             if (null != configurableDirectory && configurableDirectory.ToUpper(CultureInfo.InvariantCulture) != configurableDirectory)
             {
-                this.Core.Write(ErrorMessages.FeatureConfigurableDirectoryNotUppercase(sourceLineNumbers, node.Name.LocalName, "ConfigurableDirectory", configurableDirectory));
+                this.Core.Write(CoreErrors.FeatureConfigurableDirectoryNotUppercase(sourceLineNumbers, node.Name.LocalName, "ConfigurableDirectory", configurableDirectory));
             }
 
             if (FeatureTypicalDefault.Advertise == typicalDefault && disallowAdvertise)
             {
-                this.Core.Write(ErrorMessages.FeatureCannotFavorAndDisallowAdvertise(sourceLineNumbers, node.Name.LocalName, "TypicalDefault", "advertise", "AllowAdvertise", "no"));
+                this.Core.Write(CoreErrors.FeatureCannotFavorAndDisallowAdvertise(sourceLineNumbers, node.Name.LocalName, "TypicalDefault", "advertise", "AllowAdvertise", "no"));
             }
 
             var childDisplay = 0;
@@ -4999,7 +4999,7 @@ namespace WixToolset.Core
                             var extensionAdvertise = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib);
                             if ((YesNoType.No == advertise && YesNoType.Yes == extensionAdvertise) || (YesNoType.Yes == advertise && YesNoType.No == extensionAdvertise))
                             {
-                                this.Core.Write(ErrorMessages.AdvertiseStateMustMatch(sourceLineNumbers, extensionAdvertise.ToString(), advertise.ToString()));
+                                this.Core.Write(CoreErrors.AdvertiseStateMustMatch(sourceLineNumbers, extensionAdvertise.ToString(), advertise.ToString()));
                             }
                             advertise = extensionAdvertise;
                             break;
@@ -5978,7 +5978,7 @@ namespace WixToolset.Core
                 // value must be specified and unique.
                 if (isSameId)
                 {
-                    this.Core.Write(ErrorMessages.UniqueFileSearchIdRequired(sourceLineNumbers, parentSignature, node.Name.LocalName));
+                    this.Core.Write(CoreErrors.UniqueFileSearchIdRequired(sourceLineNumbers, parentSignature, node.Name.LocalName));
                 }
             }
             else if (parentDepth > 1)
@@ -5987,7 +5987,7 @@ namespace WixToolset.Core
                 // as the parent DirectorySearch if AssignToProperty is not set.
                 if (!isSameId)
                 {
-                    this.Core.Write(ErrorMessages.IllegalSearchIdForParentDepth(sourceLineNumbers, id.Id, parentSignature));
+                    this.Core.Write(CoreErrors.IllegalSearchIdForParentDepth(sourceLineNumbers, id.Id, parentSignature));
                 }
             }
 
@@ -6574,7 +6574,7 @@ namespace WixToolset.Core
                         case "DirectorySearch":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
 
@@ -6584,7 +6584,7 @@ namespace WixToolset.Core
                         case "DirectorySearchRef":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(childSourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseDirectorySearchRefElement(child, id.Id);
@@ -6592,7 +6592,7 @@ namespace WixToolset.Core
                         case "FileSearch":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             signature = this.ParseFileSearchElement(child, id.Id, false, CompilerConstants.IntegerNotSet);
@@ -6601,7 +6601,7 @@ namespace WixToolset.Core
                         case "FileSearchRef":
                             if (oneChild)
                             {
-                                this.Core.Write(ErrorMessages.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManySearchElements(sourceLineNumbers, node.Name.LocalName));
                             }
                             oneChild = true;
                             var newId = this.ParseSimpleRefElement(child, SymbolDefinitions.Signature); // FileSearch signatures override parent signatures
@@ -6909,13 +6909,13 @@ namespace WixToolset.Core
             var upgradeCode = contextValues["UpgradeCode"];
             if (String.IsNullOrEmpty(upgradeCode))
             {
-                this.Core.Write(ErrorMessages.ParentElementAttributeRequired(sourceLineNumbers, "Package", "UpgradeCode", node.Name.LocalName));
+                this.Core.Write(CoreErrors.ParentElementAttributeRequired(sourceLineNumbers, "Package", "UpgradeCode", node.Name.LocalName));
             }
 
             var productVersion = contextValues["ProductVersion"];
             if (String.IsNullOrEmpty(productVersion))
             {
-                this.Core.Write(ErrorMessages.ParentElementAttributeRequired(sourceLineNumbers, "Package", "Version", node.Name.LocalName));
+                this.Core.Write(CoreErrors.ParentElementAttributeRequired(sourceLineNumbers, "Package", "Version", node.Name.LocalName));
             }
 
             var productLanguage = contextValues["ProductLanguage"];
@@ -7158,7 +7158,7 @@ namespace WixToolset.Core
                     {
                         if (62 < cabinet.Length)
                         {
-                            this.Core.Write(ErrorMessages.MediaEmbeddedCabinetNameTooLong(sourceLineNumbers, node.Name.LocalName, "Cabinet", cabinet, cabinet.Length));
+                            this.Core.Write(CoreErrors.MediaEmbeddedCabinetNameTooLong(sourceLineNumbers, node.Name.LocalName, "Cabinet", cabinet, cabinet.Length));
                         }
 
                         cabinet = String.Concat("#", cabinet);
@@ -7198,11 +7198,11 @@ namespace WixToolset.Core
                         case "DigitalSignature":
                             if (YesNoType.Yes == embedCab)
                             {
-                                this.Core.Write(ErrorMessages.SignedEmbeddedCabinet(childSourceLineNumbers));
+                                this.Core.Write(CoreErrors.SignedEmbeddedCabinet(childSourceLineNumbers));
                             }
                             else if (null == cabinet)
                             {
-                                this.Core.Write(ErrorMessages.ExpectedSignedCabinetName(childSourceLineNumbers));
+                                this.Core.Write(CoreErrors.ExpectedSignedCabinetName(childSourceLineNumbers));
                             }
                             else
                             {
@@ -7305,7 +7305,7 @@ namespace WixToolset.Core
                                 // reason for having multiple cabinets. External cabinet files must also be valid file names.
                                 if (exampleCabinetName.Equals(authoredCabinetTemplateValue, StringComparison.OrdinalIgnoreCase) || !this.Core.IsValidLongFilename(exampleCabinetName, false))
                                 {
-                                    this.Core.Write(ErrorMessages.InvalidCabinetTemplate(sourceLineNumbers, cabinetTemplate));
+                                    this.Core.Write(CoreErrors.InvalidCabinetTemplate(sourceLineNumbers, cabinetTemplate));
                                 }
                                 else if (!this.Core.IsValidLongFilename(exampleCabinetName) && !Common.ContainsValidBinderVariable(exampleCabinetName)) // ignore short names with wix variables because it rarely works out.
                                 {
@@ -7798,7 +7798,7 @@ namespace WixToolset.Core
             {
                 if (YesNoType.Yes != parentAdvertised)
                 {
-                    this.Core.Write(ErrorMessages.AdvertiseStateMustMatch(sourceLineNumbers, advertise.ToString(), parentAdvertised.ToString()));
+                    this.Core.Write(CoreErrors.AdvertiseStateMustMatch(sourceLineNumbers, advertise.ToString(), parentAdvertised.ToString()));
                 }
 
                 if (!this.Core.EncounteredError)
@@ -7815,7 +7815,7 @@ namespace WixToolset.Core
             {
                 if (YesNoType.Yes == returnContentType && YesNoType.Yes == parentAdvertised)
                 {
-                    this.Core.Write(ErrorMessages.CannotDefaultMismatchedAdvertiseStates(sourceLineNumbers));
+                    this.Core.Write(CoreErrors.CannotDefaultMismatchedAdvertiseStates(sourceLineNumbers));
                 }
 
                 this.Core.CreateRegistryStringSymbol(sourceLineNumbers, RegistryRootType.ClassesRoot, String.Concat("MIME\\Database\\Content Type\\", contentType), "Extension", String.Concat(".", extension), componentId);
@@ -8109,7 +8109,7 @@ namespace WixToolset.Core
                             if (parsedValidate)
                             {
                                 var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
-                                this.Core.Write(ErrorMessages.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, child.Name.LocalName));
+                                this.Core.Write(CoreErrors.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, child.Name.LocalName));
                             }
                             else
                             {
diff --git a/src/wix/WixToolset.Core/CompilerCore.cs b/src/wix/WixToolset.Core/CompilerCore.cs
index 57d84c3a..5abd3f70 100644
--- a/src/wix/WixToolset.Core/CompilerCore.cs
+++ b/src/wix/WixToolset.Core/CompilerCore.cs
@@ -446,7 +446,7 @@ namespace WixToolset.Core
             }
             catch (NotSupportedException)
             {
-                this.Write(ErrorMessages.IllegalCodepageAttribute(sourceLineNumbers, value, attribute.Parent.Name.LocalName, attribute.Name.LocalName));
+                this.Write(CoreErrors.IllegalCodepageAttribute(sourceLineNumbers, value, attribute.Parent.Name.LocalName, attribute.Name.LocalName));
             }
 
             return CompilerConstants.IllegalInteger;
@@ -482,7 +482,7 @@ namespace WixToolset.Core
             catch (NotSupportedException)
             {
                 // Not a valid windows code page.
-                this.messaging.Write(ErrorMessages.IllegalCodepageAttribute(sourceLineNumbers, value, attribute.Parent.Name.LocalName, attribute.Name.LocalName));
+                this.messaging.Write(CoreErrors.IllegalCodepageAttribute(sourceLineNumbers, value, attribute.Parent.Name.LocalName, attribute.Name.LocalName));
             }
             catch (WixException e)
             {
@@ -552,7 +552,7 @@ namespace WixToolset.Core
 
                     if (date.Year < 1980 || date.Year > 2043)
                     {
-                        this.Write(ErrorMessages.InvalidDateTimeFormat(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                        this.Write(CoreErrors.InvalidDateTimeFormat(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
                     }
 
                     return ((((date.Year - 1980) * 512) + (date.Month * 32 + date.Day)) * 65536) +
@@ -560,15 +560,15 @@ namespace WixToolset.Core
                 }
                 catch (ArgumentOutOfRangeException)
                 {
-                    this.Write(ErrorMessages.InvalidDateTimeFormat(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                    this.Write(CoreErrors.InvalidDateTimeFormat(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
                 }
                 catch (FormatException)
                 {
-                    this.Write(ErrorMessages.InvalidDateTimeFormat(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                    this.Write(CoreErrors.InvalidDateTimeFormat(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
                 }
                 catch (OverflowException)
                 {
-                    this.Write(ErrorMessages.InvalidDateTimeFormat(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                    this.Write(CoreErrors.InvalidDateTimeFormat(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
                 }
             }
 
@@ -712,7 +712,7 @@ namespace WixToolset.Core
                     && !Common.ContainsValidBinderVariable(value)
                     && !this.IsValidLocIdentifier(value))
                 {
-                    this.Write(ErrorMessages.IllegalShortFilename(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                    this.Write(CoreErrors.IllegalShortFilename(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
                 }
                 else if (CompilerCore.IsAmbiguousFilename(value))
                 {
@@ -917,11 +917,11 @@ namespace WixToolset.Core
                 {
                     if (this.GetType().Assembly.Equals(caller))
                     {
-                        this.Write(ErrorMessages.InsufficientVersion(sourceLineNumbers, versionCurrent, versionRequired));
+                        this.Write(CoreErrors.InsufficientVersion(sourceLineNumbers, versionCurrent, versionRequired));
                     }
                     else
                     {
-                        this.Write(ErrorMessages.InsufficientVersion(sourceLineNumbers, versionCurrent, versionRequired, name.Name));
+                        this.Write(CoreErrors.InsufficientVersion(sourceLineNumbers, versionCurrent, versionRequired, name.Name));
                     }
                 }
             }
diff --git a/src/wix/WixToolset.Core/CompilerErrors.cs b/src/wix/WixToolset.Core/CompilerErrors.cs
index a7f9b06c..0f30a69a 100644
--- a/src/wix/WixToolset.Core/CompilerErrors.cs
+++ b/src/wix/WixToolset.Core/CompilerErrors.cs
@@ -2,7 +2,6 @@
 
 namespace WixToolset.Core
 {
-    using System;
     using WixToolset.Data;
 
     internal static class CompilerErrors
diff --git a/src/wix/WixToolset.Core/Compiler_Bundle.cs b/src/wix/WixToolset.Core/Compiler_Bundle.cs
index db49e728..81f759a1 100644
--- a/src/wix/WixToolset.Core/Compiler_Bundle.cs
+++ b/src/wix/WixToolset.Core/Compiler_Bundle.cs
@@ -338,7 +338,7 @@ namespace WixToolset.Core
                             if (chainSeen)
                             {
                                 var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
-                                this.Core.Write(ErrorMessages.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, "Chain"));
+                                this.Core.Write(CoreErrors.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, "Chain"));
                             }
                             this.ParseChainElement(child);
                             chainSeen = true;
@@ -353,7 +353,7 @@ namespace WixToolset.Core
                             if (logSeen)
                             {
                                 var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
-                                this.Core.Write(ErrorMessages.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, "Log"));
+                                this.Core.Write(CoreErrors.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, "Log"));
                             }
                             logVariablePrefixAndExtension = this.ParseLogElement(child, fileSystemSafeBundleName);
                             logSeen = true;
@@ -386,7 +386,7 @@ namespace WixToolset.Core
                             if (updateSeen)
                             {
                                 var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
-                                this.Core.Write(ErrorMessages.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, "Update"));
+                                this.Core.Write(CoreErrors.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, "Update"));
                             }
                             this.ParseUpdateElement(child);
                             updateSeen = true;
@@ -2310,7 +2310,7 @@ namespace WixToolset.Core
 
                 if (childCompilerPackagePayload != null)
                 {
-                    this.Core.Write(ErrorMessages.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, child.Name.LocalName));
+                    this.Core.Write(CoreErrors.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, child.Name.LocalName));
                 }
                 else if (hasPayloadInfo)
                 {
@@ -2832,7 +2832,7 @@ namespace WixToolset.Core
                                 if (remoteBundleSeen)
                                 {
                                     var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
-                                    this.Core.Write(ErrorMessages.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, "RemoteBundle"));
+                                    this.Core.Write(CoreErrors.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, "RemoteBundle"));
                                 }
 
                                 this.ParseRemoteBundleElement(child, compilerPayload.Id.Id);
diff --git a/src/wix/WixToolset.Core/Compiler_CustomTable.cs b/src/wix/WixToolset.Core/Compiler_CustomTable.cs
index 03fa2323..1e18f250 100644
--- a/src/wix/WixToolset.Core/Compiler_CustomTable.cs
+++ b/src/wix/WixToolset.Core/Compiler_CustomTable.cs
@@ -56,7 +56,7 @@ namespace WixToolset.Core
             }
             else if (31 < tableId.Length)
             {
-                this.Core.Write(ErrorMessages.CustomTableNameTooLong(sourceLineNumbers, node.Name.LocalName, "Id", tableId));
+                this.Core.Write(CoreErrors.CustomTableNameTooLong(sourceLineNumbers, node.Name.LocalName, "Id", tableId));
             }
 
             foreach (var child in node.Elements())
@@ -93,7 +93,7 @@ namespace WixToolset.Core
             {
                 if (!columns.Where(c => c.PrimaryKey).Any())
                 {
-                    this.Core.Write(ErrorMessages.CustomTableMissingPrimaryKey(sourceLineNumbers));
+                    this.Core.Write(CoreErrors.CustomTableMissingPrimaryKey(sourceLineNumbers));
                 }
 
                 if (!this.Core.EncounteredError)
@@ -407,7 +407,7 @@ namespace WixToolset.Core
             {
                 if (2 != width && 4 != width)
                 {
-                    this.Core.Write(ErrorMessages.CustomTableIllegalColumnWidth(childSourceLineNumbers, child.Name.LocalName, "Width", width));
+                    this.Core.Write(CoreErrors.CustomTableIllegalColumnWidth(childSourceLineNumbers, child.Name.LocalName, "Width", width));
                 }
             }
             else if (columnType == IntermediateFieldType.Path)
@@ -418,7 +418,7 @@ namespace WixToolset.Core
                 }
                 else if (category != WixCustomTableColumnCategoryType.Binary)
                 {
-                    this.Core.Write(ErrorMessages.ExpectedBinaryCategory(childSourceLineNumbers));
+                    this.Core.Write(CoreErrors.ExpectedBinaryCategory(childSourceLineNumbers));
                 }
             }
 
diff --git a/src/wix/WixToolset.Core/Compiler_EmbeddedUI.cs b/src/wix/WixToolset.Core/Compiler_EmbeddedUI.cs
index ede03933..a0ba652d 100644
--- a/src/wix/WixToolset.Core/Compiler_EmbeddedUI.cs
+++ b/src/wix/WixToolset.Core/Compiler_EmbeddedUI.cs
@@ -295,7 +295,7 @@ namespace WixToolset.Core
 
             if (!name.Contains("."))
             {
-                this.Core.Write(ErrorMessages.InvalidEmbeddedUIFileName(sourceLineNumbers, name));
+                this.Core.Write(CoreErrors.InvalidEmbeddedUIFileName(sourceLineNumbers, name));
             }
 
             foreach (var child in node.Elements())
diff --git a/src/wix/WixToolset.Core/Compiler_Module.cs b/src/wix/WixToolset.Core/Compiler_Module.cs
index 08f47657..41a75165 100644
--- a/src/wix/WixToolset.Core/Compiler_Module.cs
+++ b/src/wix/WixToolset.Core/Compiler_Module.cs
@@ -420,7 +420,7 @@ namespace WixToolset.Core
 
             if (CompilerConstants.IntegerNotSet != excludeExceptLanguage && CompilerConstants.IntegerNotSet != excludeLanguage)
             {
-                this.Core.Write(ErrorMessages.IllegalModuleExclusionLanguageAttributes(sourceLineNumbers));
+                this.Core.Write(CoreErrors.IllegalModuleExclusionLanguageAttributes(sourceLineNumbers));
             }
             else if (CompilerConstants.IntegerNotSet != excludeExceptLanguage)
             {
diff --git a/src/wix/WixToolset.Core/Compiler_Package.cs b/src/wix/WixToolset.Core/Compiler_Package.cs
index e0af9695..004c8c1d 100644
--- a/src/wix/WixToolset.Core/Compiler_Package.cs
+++ b/src/wix/WixToolset.Core/Compiler_Package.cs
@@ -1310,7 +1310,7 @@ namespace WixToolset.Core
 
             if ((YesNoType.No == advertise && YesNoType.Yes == progIdAdvertise) || (YesNoType.Yes == advertise && YesNoType.No == progIdAdvertise))
             {
-                this.Core.Write(ErrorMessages.AdvertiseStateMustMatch(sourceLineNumbers, advertise.ToString(), progIdAdvertise.ToString()));
+                this.Core.Write(CoreErrors.AdvertiseStateMustMatch(sourceLineNumbers, advertise.ToString(), progIdAdvertise.ToString()));
             }
             else if (YesNoType.NotSet != progIdAdvertise)
             {
@@ -1324,7 +1324,7 @@ namespace WixToolset.Core
 
             if (null != parent && (null != icon || CompilerConstants.IntegerNotSet != iconIndex))
             {
-                this.Core.Write(ErrorMessages.VersionIndependentProgIdsCannotHaveIcons(sourceLineNumbers));
+                this.Core.Write(CoreErrors.VersionIndependentProgIdsCannotHaveIcons(sourceLineNumbers));
             }
 
             var firstProgIdForNestedClass = YesNoType.Yes;
@@ -1356,7 +1356,7 @@ namespace WixToolset.Core
                         else
                         {
                             var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
-                            this.Core.Write(ErrorMessages.ProgIdNestedTooDeep(childSourceLineNumbers));
+                            this.Core.Write(CoreErrors.ProgIdNestedTooDeep(childSourceLineNumbers));
                         }
                         break;
                     default:
@@ -1513,7 +1513,7 @@ namespace WixToolset.Core
             }
             else if ("SecureCustomProperties" == id.Id || "AdminProperties" == id.Id || "MsiHiddenProperties" == id.Id)
             {
-                this.Core.Write(ErrorMessages.CannotAuthorSpecialProperties(sourceLineNumbers, id.Id));
+                this.Core.Write(CoreErrors.CannotAuthorSpecialProperties(sourceLineNumbers, id.Id));
             }
 
             if ("ErrorDialog" == id.Id)
@@ -1548,7 +1548,7 @@ namespace WixToolset.Core
             // If we're doing CCP then there must be a signature.
             if (complianceCheck && 0 == signatures.Count)
             {
-                this.Core.Write(ErrorMessages.SearchElementRequiredWithAttribute(sourceLineNumbers, node.Name.LocalName, "ComplianceCheck", "yes"));
+                this.Core.Write(CoreErrors.SearchElementRequiredWithAttribute(sourceLineNumbers, node.Name.LocalName, "ComplianceCheck", "yes"));
             }
 
             foreach (var sig in signatures)
@@ -1638,7 +1638,7 @@ namespace WixToolset.Core
                     case "Root":
                         if (root.HasValue)
                         {
-                            this.Core.Write(ErrorMessages.RegistryRootInvalid(sourceLineNumbers));
+                            this.Core.Write(CoreErrors.RegistryRootInvalid(sourceLineNumbers));
                         }
 
                         root = this.Core.GetAttributeRegistryRootValue(sourceLineNumbers, attrib, true);
@@ -1696,7 +1696,7 @@ namespace WixToolset.Core
                         {
                             if (YesNoType.Yes == keyPath)
                             {
-                                this.Core.Write(ErrorMessages.ComponentMultipleKeyPaths(sourceLineNumbers, child.Name.LocalName, "KeyPath", "yes", "File", "RegistryValue", "ODBCDataSource"));
+                                this.Core.Write(CoreErrors.ComponentMultipleKeyPaths(sourceLineNumbers, child.Name.LocalName, "KeyPath", "yes", "File", "RegistryValue", "ODBCDataSource"));
                             }
 
                             possibleKeyPath = possibleChildKeyPath; // the child is the key path
@@ -1712,7 +1712,7 @@ namespace WixToolset.Core
                         {
                             if (YesNoType.Yes == keyPath)
                             {
-                                this.Core.Write(ErrorMessages.ComponentMultipleKeyPaths(sourceLineNumbers, child.Name.LocalName, "KeyPath", "yes", "File", "RegistryValue", "ODBCDataSource"));
+                                this.Core.Write(CoreErrors.ComponentMultipleKeyPaths(sourceLineNumbers, child.Name.LocalName, "KeyPath", "yes", "File", "RegistryValue", "ODBCDataSource"));
                             }
 
                             possibleKeyPath = possibleChildKeyPath; // the child is the key path
@@ -1839,7 +1839,7 @@ namespace WixToolset.Core
                     case "Root":
                         if (root.HasValue)
                         {
-                            this.Core.Write(ErrorMessages.RegistryRootInvalid(sourceLineNumbers));
+                            this.Core.Write(CoreErrors.RegistryRootInvalid(sourceLineNumbers));
                         }
 
                         root = this.Core.GetAttributeRegistryRootValue(sourceLineNumbers, attrib, true);
@@ -1915,7 +1915,7 @@ namespace WixToolset.Core
                     case "MultiStringValue":
                         if (RegistryValueType.MultiString != valueType && null != value)
                         {
-                            this.Core.Write(ErrorMessages.RegistryMultipleValuesWithoutMultiString(sourceLineNumbers, node.Name.LocalName, "Value", child.Name.LocalName, "Type"));
+                            this.Core.Write(CoreErrors.RegistryMultipleValuesWithoutMultiString(sourceLineNumbers, node.Name.LocalName, "Value", child.Name.LocalName, "Type"));
                         }
                         else
                         {
@@ -1985,7 +1985,7 @@ namespace WixToolset.Core
             }
             else if (0 == value?.Length && ("+" == name || "-" == name || "*" == name)) // prevent accidental authoring of special name values
             {
-                this.Core.Write(ErrorMessages.RegistryNameValueIncorrect(sourceLineNumbers, node.Name.LocalName, "Name", name));
+                this.Core.Write(CoreErrors.RegistryNameValueIncorrect(sourceLineNumbers, node.Name.LocalName, "Name", name));
             }
 
             if (!this.Core.EncounteredError)
@@ -2662,17 +2662,17 @@ namespace WixToolset.Core
                 }
                 else if ((customAction || showDialog || specialAction) && !suppress && CompilerConstants.IntegerNotSet == sequence && null == beforeAction && null == afterAction)
                 {
-                    this.Core.Write(ErrorMessages.NeedSequenceBeforeOrAfter(childSourceLineNumbers, child.Name.LocalName));
+                    this.Core.Write(CoreErrors.NeedSequenceBeforeOrAfter(childSourceLineNumbers, child.Name.LocalName));
                 }
 
                 // action that is scheduled to occur before/after itself
                 if (beforeAction == actionName)
                 {
-                    this.Core.Write(ErrorMessages.ActionScheduledRelativeToItself(childSourceLineNumbers, child.Name.LocalName, "Before", beforeAction));
+                    this.Core.Write(CoreErrors.ActionScheduledRelativeToItself(childSourceLineNumbers, child.Name.LocalName, "Before", beforeAction));
                 }
                 else if (afterAction == actionName)
                 {
-                    this.Core.Write(ErrorMessages.ActionScheduledRelativeToItself(childSourceLineNumbers, child.Name.LocalName, "After", afterAction));
+                    this.Core.Write(CoreErrors.ActionScheduledRelativeToItself(childSourceLineNumbers, child.Name.LocalName, "After", afterAction));
                 }
 
                 // normal standard actions cannot be set overridable by the user (since they are overridable by default)
@@ -3622,7 +3622,7 @@ namespace WixToolset.Core
                             break;
                         case "boot":
                         case "system":
-                            this.Core.Write(ErrorMessages.ValueNotSupported(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, startValue));
+                            this.Core.Write(CoreErrors.ValueNotSupported(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, startValue));
                             break;
                         case "":
                             break;
@@ -3643,7 +3643,7 @@ namespace WixToolset.Core
                                 break;
                             case "kernelDriver":
                             case "systemDriver":
-                                this.Core.Write(ErrorMessages.ValueNotSupported(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, typeValue));
+                                this.Core.Write(CoreErrors.ValueNotSupported(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, typeValue));
                                 break;
                             case "":
                                 break;
@@ -3947,11 +3947,11 @@ namespace WixToolset.Core
                 // action that is scheduled to occur before/after itself
                 if (beforeAction == actionName)
                 {
-                    this.Core.Write(ErrorMessages.ActionScheduledRelativeToItself(sourceLineNumbers, node.Name.LocalName, "Before", beforeAction));
+                    this.Core.Write(CoreErrors.ActionScheduledRelativeToItself(sourceLineNumbers, node.Name.LocalName, "Before", beforeAction));
                 }
                 else if (afterAction == actionName)
                 {
-                    this.Core.Write(ErrorMessages.ActionScheduledRelativeToItself(sourceLineNumbers, node.Name.LocalName, "After", afterAction));
+                    this.Core.Write(CoreErrors.ActionScheduledRelativeToItself(sourceLineNumbers, node.Name.LocalName, "After", afterAction));
                 }
 
                 this.Core.AddSymbol(new CustomActionSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, actionName))
@@ -4605,7 +4605,7 @@ namespace WixToolset.Core
             {
                 if (CompilerConstants.LongNotSet != resourceId)
                 {
-                    this.Core.Write(ErrorMessages.IllegalAttributeWhenAdvertised(sourceLineNumbers, node.Name.LocalName, "ResourceId"));
+                    this.Core.Write(CoreErrors.IllegalAttributeWhenAdvertised(sourceLineNumbers, node.Name.LocalName, "ResourceId"));
                 }
 
                 if (0 != flags)
@@ -4663,7 +4663,7 @@ namespace WixToolset.Core
 
                 if (null == fileServer)
                 {
-                    this.Core.Write(ErrorMessages.MissingTypeLibFile(sourceLineNumbers, node.Name.LocalName, "File"));
+                    this.Core.Write(CoreErrors.MissingTypeLibFile(sourceLineNumbers, node.Name.LocalName, "File"));
                 }
 
                 if (null == registryVersion)
@@ -4834,7 +4834,7 @@ namespace WixToolset.Core
             }
             else if (actionProperty.ToUpper(CultureInfo.InvariantCulture) != actionProperty)
             {
-                this.Core.Write(ErrorMessages.SecurePropertyNotUppercase(sourceLineNumbers, node.Name.LocalName, "Property", actionProperty));
+                this.Core.Write(CoreErrors.SecurePropertyNotUppercase(sourceLineNumbers, node.Name.LocalName, "Property", actionProperty));
             }
 
             if (null == minimum && null == maximum)
@@ -4941,12 +4941,12 @@ namespace WixToolset.Core
             {
                 if (null != targetFile)
                 {
-                    this.Core.Write(ErrorMessages.IllegalAttributeWhenAdvertised(sourceLineNumbers, node.Name.LocalName, "TargetFile"));
+                    this.Core.Write(CoreErrors.IllegalAttributeWhenAdvertised(sourceLineNumbers, node.Name.LocalName, "TargetFile"));
                 }
 
                 if (null != targetProperty)
                 {
-                    this.Core.Write(ErrorMessages.IllegalAttributeWhenAdvertised(sourceLineNumbers, node.Name.LocalName, "TargetProperty"));
+                    this.Core.Write(CoreErrors.IllegalAttributeWhenAdvertised(sourceLineNumbers, node.Name.LocalName, "TargetProperty"));
                 }
 
                 if (!this.Core.EncounteredError)
@@ -5085,7 +5085,7 @@ namespace WixToolset.Core
             case "":
                 break;
             default:
-                this.Core.Write(ErrorMessages.IllegalCompressionLevel(sourceLineNumbers, compressionLevel));
+                this.Core.Write(CoreErrors.IllegalCompressionLevel(sourceLineNumbers, compressionLevel));
                 break;
             }
 
diff --git a/src/wix/WixToolset.Core/Compiler_UI.cs b/src/wix/WixToolset.Core/Compiler_UI.cs
index d9ff2a36..eeeeaa46 100644
--- a/src/wix/WixToolset.Core/Compiler_UI.cs
+++ b/src/wix/WixToolset.Core/Compiler_UI.cs
@@ -82,7 +82,7 @@ namespace WixToolset.Core
                         if (0 < embeddedUICount) // there can be only one embedded UI
                         {
                             var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
-                            this.Core.Write(ErrorMessages.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, child.Name.LocalName));
+                            this.Core.Write(CoreErrors.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, child.Name.LocalName));
                         }
                         this.ParseEmbeddedUIElement(child);
                         ++embeddedUICount;
@@ -108,7 +108,7 @@ namespace WixToolset.Core
                         if (RadioButtonType.Bitmap == radioButtonType || RadioButtonType.Icon == radioButtonType)
                         {
                             var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
-                            this.Core.Write(ErrorMessages.RadioButtonBitmapAndIconDisallowed(childSourceLineNumbers));
+                            this.Core.Write(CoreErrors.RadioButtonBitmapAndIconDisallowed(childSourceLineNumbers));
                         }
                         break;
                     case "TextStyle":
@@ -639,7 +639,7 @@ namespace WixToolset.Core
                         else if (groupType != type)
                         {
                             var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(child);
-                            this.Core.Write(ErrorMessages.RadioButtonTypeInconsistent(childSourceLineNumbers));
+                            this.Core.Write(CoreErrors.RadioButtonTypeInconsistent(childSourceLineNumbers));
                         }
                         break;
                     default:
@@ -1009,7 +1009,7 @@ namespace WixToolset.Core
 
             if (null == firstControl)
             {
-                this.Core.Write(ErrorMessages.NoFirstControlSpecified(sourceLineNumbers, id.Id));
+                this.Core.Write(CoreErrors.NoFirstControlSpecified(sourceLineNumbers, id.Id));
             }
 
             if (!this.Core.EncounteredError)
@@ -1611,7 +1611,7 @@ namespace WixToolset.Core
                 }
                 else if (symbol != null)
                 {
-                    this.Core.Write(ErrorMessages.TabbableControlNotAllowedInBillboard(sourceLineNumbers, node.Name.LocalName, controlType));
+                    this.Core.Write(CoreErrors.TabbableControlNotAllowedInBillboard(sourceLineNumbers, node.Name.LocalName, controlType));
                 }
 
                 if (null == firstControl)
diff --git a/src/wix/WixToolset.Core/CoreErrors.cs b/src/wix/WixToolset.Core/CoreErrors.cs
index 16feb9dc..1789de31 100644
--- a/src/wix/WixToolset.Core/CoreErrors.cs
+++ b/src/wix/WixToolset.Core/CoreErrors.cs
@@ -2,6 +2,8 @@
 
 namespace WixToolset.Core
 {
+    using System;
+    using System.Collections.Generic;
     using WixToolset.Data;
 
     internal static class CoreErrors
@@ -31,6 +33,741 @@ namespace WixToolset.Core
             return Message(null, Ids.BackendNotFound, "Unable to find a backend to process output type: {0} for output file: {1}. Specify a different output type or output file extension.", outputType, outputPath);
         }
 
+        public static Message AdditionalArgumentUnexpected(string argument)
+        {
+            return Message(null, Ids.AdditionalArgumentUnexpected, "Additional argument '{0}' was unexpected. Remove the argument and add the '-?' switch for more information.", argument);
+        }
+
+        public static Message IntermediatesMustBeCompiled(string invalidIntermediates)
+        {
+            return Message(null, Ids.IntermediatesMustBeCompiled, "Intermediates being linked must have been compiled. Intermediates with these ids were not compiled: {0}", invalidIntermediates);
+        }
+
+        public static Message WixiplSourceFileIsExclusive()
+        {
+            return Message(null, Ids.WixiplSourceFileIsExclusive, "When an intermediate post link source file is specified, it must be the only source file provided.");
+        }
+
+        public static Message CannotReundefineVariable(SourceLineNumber sourceLineNumbers, string variableName)
+        {
+            return Message(sourceLineNumbers, Ids.CannotReundefineVariable, "The variable '{0}' cannot be undefined because its already undefined.", variableName);
+        }
+
+        public static Message ComponentExpectedFeature(SourceLineNumber sourceLineNumbers, string component, string type, string target)
+        {
+            return Message(sourceLineNumbers, Ids.ComponentExpectedFeature, "The component '{0}' is not assigned to a feature. The component's {1} '{2}' requires it to be assigned to at least one feature.", component, type, target);
+        }
+
+        public static Message ComponentReferencedTwice(SourceLineNumber sourceLineNumbers, string crefChildId)
+        {
+            return Message(sourceLineNumbers, Ids.ComponentReferencedTwice, "Component {0} cannot be contained in a Module twice.", crefChildId);
+        }
+
+        public static Message DisallowedMsiProperty(SourceLineNumber sourceLineNumbers, string property, string illegalValueList)
+        {
+            return Message(sourceLineNumbers, Ids.DisallowedMsiProperty, "The '{0}' MsiProperty is controlled by the bootstrapper and cannot be authored. (Illegal properties are: {1}.) Remove the MsiProperty element.", property, illegalValueList);
+        }
+
+        public static Message DuplicatedUiLocalization(SourceLineNumber sourceLineNumbers, string controlName, string dialogName)
+        {
+            return Message(sourceLineNumbers, Ids.DuplicatedUiLocalization, "The localization for control {0} in dialog {1} is duplicated. Only one localization per control is allowed.", controlName, dialogName);
+        }
+
+        public static Message DuplicatedUiLocalization(SourceLineNumber sourceLineNumbers, string dialogName)
+        {
+            return Message(sourceLineNumbers, Ids.DuplicatedUiLocalization, "The localization for dialog {0} is duplicated. Only one localization per dialog is allowed.", dialogName);
+        }
+
+        public static Message DuplicateExtensionPreprocessorType(string extension, string variablePrefix, string collidingExtension)
+        {
+            return Message(null, Ids.DuplicateExtensionPreprocessorType, "The extension '{0}' uses the same preprocessor variable prefix, '{1}', as previously loaded extension '{2}'. Please remove one of the extensions or rename the prefix to avoid the collision.", extension, variablePrefix, collidingExtension);
+        }
+
+        public static Message DuplicateLocalizationIdentifier(SourceLineNumber sourceLineNumbers, string localizationId)
+        {
+            return Message(sourceLineNumbers, Ids.DuplicateLocalizationIdentifier, "The localization identifier '{0}' has been duplicated in multiple locations. A common cause is a bundle .wixproj that automatically loads .wxl files that are intended for the bootstrapper application. You can turn off that behavior by setting the EnableDefaultEmbeddedResourceItems property to false.", localizationId);
+        }
+
+        public static Message DuplicateVariableDefinition(string variableName, string variableValue, string variableCollidingValue)
+        {
+            return Message(null, Ids.DuplicateVariableDefinition, "The variable '{0}' with value '{1}' was previously declared with value '{2}'.", variableName, variableValue, variableCollidingValue);
+        }
+
+        public static Message ExampleGuid(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.ExampleGuid, "The {0}/@{1} attribute's value, '{2}', is not a legal Guid value. A Guid needs to be generated and put in place of '{2}' in the source file.", elementName, attributeName, value);
+        }
+
+        public static Message ExpectedArgument(string argument)
+        {
+            return Message(null, Ids.ExpectedArgument, "{0} is expected to be followed by a value. See -? for additional detail.", argument);
+        }
+
+        public static Message ExpectedDirectory(string directory)
+        {
+            return Message(null, Ids.ExpectedDirectory, "The directory '{0}' could not be found.", directory);
+        }
+
+        public static Message ExpectedDirectoryGotFile(string option, string path)
+        {
+            return Message(null, Ids.ExpectedDirectoryGotFile, "The {0} option requires a directory, but the provided path is a file: {1}", option, path);
+        }
+
+        public static Message ExpectedEndforeach(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.ExpectedEndforeach, "A <?foreach?> statement was found that had no matching <?endforeach?>.");
+        }
+
+        public static Message ExpectedExpressionAfterNot(SourceLineNumber sourceLineNumbers, string expression)
+        {
+            return Message(sourceLineNumbers, Ids.ExpectedExpressionAfterNot, "Expecting an argument for 'NOT' in expression '{0}'.", expression);
+        }
+
+        public static Message ExpectedFileGotDirectory(string option, string path)
+        {
+            return Message(null, Ids.ExpectedFileGotDirectory, "The {0} option requires a file, but the provided path is a directory: {1}", option, path);
+        }
+
+        public static Message ExpectedVariable(SourceLineNumber sourceLineNumbers, string expression)
+        {
+            return Message(sourceLineNumbers, Ids.ExpectedVariable, "A required variable was missing in the expression '{0}'.", expression);
+        }
+
+        public static Message FileInUse(SourceLineNumber sourceLineNumbers, string file)
+        {
+            return Message(sourceLineNumbers, Ids.FileInUse, "The process can not access the file '{0}' because it is being used by another process.", file);
+        }
+
+        public static Message IllegalAttributeValueWithIllegalList(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, string illegalValueList)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalAttributeValueWithIllegalList, "The {0}/@{1} attribute's value, '{2}', is one of the illegal options: {3}.", elementName, attributeName, value, illegalValueList);
+        }
+
+        public static Message IllegalDefineStatement(SourceLineNumber sourceLineNumbers, string defineStatement)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalDefineStatement, "The define statement '<?define {0}?>' is not well-formed. Define statements should be in the form <?define variableName = \"variable value\"?>.", defineStatement);
+        }
+
+        public static Message IllegalForeach(SourceLineNumber sourceLineNumbers, string foreachStatement)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalForeach, "The foreach statement '{0}' is illegal. The proper format for foreach is <?foreach varName in valueList?>.", foreachStatement);
+        }
+
+        public static Message IllegalIdentifierLooksLikeFormatted(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalIdentifierLooksLikeFormatted, "The {0}/@{1} attribute's value, '{2}', is not a legal identifier. The {0}/@{1} attribute does not support formatted string values, such as property names enclosed in brackets ([LIKETHIS]). The value must be the identifier of another element, such as the Directory/@Id attribute value.", elementName, attributeName, value);
+        }
+
+        public static Message IllegalInlineLocVariable(SourceLineNumber sourceLineNumbers, string variableName, string variableValue)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalInlineLocVariable, "The localization variable '{0}' specifies an illegal inline default value of '{1}'. Localization variables cannot specify default values inline, instead the value should be specified in a WiX localization (.wxl) file.", variableName, variableValue);
+        }
+
+        public static Message IllegalIntegerInExpression(SourceLineNumber sourceLineNumbers, string expression)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalIntegerInExpression, "An illegal number was found in the expression '{0}'.", expression);
+        }
+
+        public static Message IllegalLongValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalLongValue, "The {0}/@{1} attribute's value, '{2}', is not a legal long value. Legal long values are from -9,223,372,036,854,775,808 to 9,223,372,036,854,775,807.", elementName, attributeName, value);
+        }
+
+        public static Message IllegalSuppressWarningId(string suppressedId)
+        {
+            return Message(null, Ids.IllegalSuppressWarningId, "Illegal value '{0}' for the -sw<N> command line option. Specify a particular warning number, like '-sw6' to suppress the warning with ID 6, or '-sw' alone to suppress all warnings.", suppressedId);
+        }
+
+        public static Message IllegalWarningIdAsError(string warningId)
+        {
+            return Message(null, Ids.IllegalWarningIdAsError, "Illegal value '{0}' for the -wx<N> command line option. Specify a particular warning number, like '-wx6' to display the warning with ID 6 as an error, or '-wx' alone to suppress all warnings.", warningId);
+        }
+
+        public static Message IllegalYesNoDefaultValue(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalYesNoDefaultValue, "The {0}/@{1} attribute's value, '{2}', is not a legal yes/no/default value. The only legal values are 'default', 'no' or 'yes'.", elementName, attributeName, value);
+        }
+
+        public static Message InvalidCommandLineFileName(string fileName, string error)
+        {
+            return Message(null, Ids.InvalidCommandLineFileName, "Invalid file name specified on the command line: '{0}'. Error message: '{1}'", fileName, error);
+        }
+
+        public static Message InvalidBundleCondition(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string condition)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidBundleCondition, "The {0}/@{1} attribute's value '{2}' is not a valid bundle condition.", elementName, attributeName, condition);
+        }
+
+        public static Message CouldNotFindExtensionInPaths(string extensionPath, IEnumerable<string> checkedPaths)
+        {
+            return Message(null, Ids.InvalidExtension, "The extension '{0}' could not be found. Checked paths: {1}", extensionPath, String.Join(", ", checkedPaths));
+        }
+
+        public static Message InvalidExtension(string extension)
+        {
+            return Message(null, Ids.InvalidExtension, "The extension '{0}' could not be loaded.", extension);
+        }
+
+        public static Message InvalidExtension(string extension, string invalidReason)
+        {
+            return Message(null, Ids.InvalidExtension, "The extension '{0}' could not be loaded because of the following reason: {1}", extension, invalidReason);
+        }
+
+        public static Message InvalidExtension(string extension, string extensionType, string expectedType)
+        {
+            return Message(null, Ids.InvalidExtension, "The extension '{0}' is the wrong type: '{1}'. The expected type was '{2}'.", extension, extensionType, expectedType);
+        }
+
+        public static Message InvalidExtension(string extension, string extensionType, string expectedType1, string expectedType2)
+        {
+            return Message(null, Ids.InvalidExtension, "The extension '{0}' is the wrong type: '{1}'. The expected type was '{2}' or '{3}'.", extension, extensionType, expectedType1, expectedType2);
+        }
+
+        public static Message InvalidPreprocessorFunction(SourceLineNumber sourceLineNumbers, string variable)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidPreprocessorFunction, "Ill-formed preprocessor function '${0}'. Functions must have a prefix (like 'fun.'), a name at least 1 character long, and matching opening and closing parentheses.", variable);
+        }
+
+        public static Message InvalidPreprocessorFunctionAutoVersion(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidPreprocessorFunctionAutoVersion, "Invalid AutoVersion template specified.");
+        }
+
+        public static Message InvalidPreprocessorPragma(SourceLineNumber sourceLineNumbers, string variable)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidPreprocessorPragma, "Malformed preprocessor pragma '{0}'. Pragmas must have a prefix, a name of at least 1 character long, and be followed by optional arguments.", variable);
+        }
+
+        public static Message InvalidPreprocessorVariable(SourceLineNumber sourceLineNumbers, string variable)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidPreprocessorVariable, "Ill-formed preprocessor variable '$({0})'. Variables must have a prefix (like 'var.', 'env.', or 'sys.') and a name at least 1 character long. If the literal string '$({0})' is desired, use '$$({0})'.", variable);
+        }
+
+        public static Message InvalidSubExpression(SourceLineNumber sourceLineNumbers, string subExpression, string expression)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidSubExpression, "Found invalid subexpression '{0}' in expression '{1}'.", subExpression, expression);
+        }
+
+        public static Message InvalidSummaryInfoCodePage(SourceLineNumber sourceLineNumbers, int codePage)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidSummaryInfoCodePage, "The code page '{0}' is invalid for summary information. You must specify an ANSI code page.", codePage);
+        }
+
+        public static Message LocalizationVariableUnknown(SourceLineNumber sourceLineNumbers, string variableId)
+        {
+            return Message(sourceLineNumbers, Ids.LocalizationVariableUnknown, "The localization variable !(loc.{0}) is unknown. Please ensure the variable is defined.", variableId);
+        }
+
+        public static Message MergeModuleExpectedFeature(SourceLineNumber sourceLineNumbers, string mergeId)
+        {
+            return Message(sourceLineNumbers, Ids.MergeModuleExpectedFeature, "The merge module '{0}' is not assigned to a feature. All merge modules must be assigned to at least one feature.", mergeId);
+        }
+
+        public static Message MissingEntrySection()
+        {
+            return Message(null, Ids.MissingEntrySection, "Could not find entry section in provided list of intermediates. Supported entry section types are: Package, Bundle, Patch, Module.");
+        }
+
+        public static Message MissingEntrySection(string sectionType)
+        {
+            return Message(null, Ids.MissingEntrySection, "Could not find entry section in provided list of intermediates. Expected section of type '{0}'.", sectionType);
+        }
+
+        public static Message MultipleEntrySections(SourceLineNumber sourceLineNumbers, string sectionName1, string sectionName2)
+        {
+            return Message(sourceLineNumbers, Ids.MultipleEntrySections, "Multiple entry sections '{0}' and '{1}' found. Only one entry section may be present in a single target.", sectionName1, sectionName2);
+        }
+
+        public static Message MultipleEntrySections2(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.MultipleEntrySections2, "Location of entry section related to previous error.");
+        }
+
+        public static Message MultiplePrimaryReferences(SourceLineNumber sourceLineNumbers, string crefChildType, string crefChildId, string crefParentType, string crefParentId, string conflictParentType, string conflictParentId)
+        {
+            return Message(sourceLineNumbers, Ids.MultiplePrimaryReferences, "Multiple primary references were found for {0} '{1}' in {2} '{3}' and {4} '{5}'.", crefChildType, crefChildId, crefParentType, crefParentId, conflictParentType, conflictParentId);
+        }
+
+        public static Message MustSpecifyOutputWithMoreThanOneInput()
+        {
+            return Message(null, Ids.MustSpecifyOutputWithMoreThanOneInput, "You must specify an output file using the \"-o\" or \"-out\" switch when you provide more than one input file.");
+        }
+
+        public static Message NonterminatedPreprocessorInstruction(SourceLineNumber sourceLineNumbers, string beginInstruction, string endInstruction)
+        {
+            return Message(sourceLineNumbers, Ids.NonterminatedPreprocessorInstruction, "Found a <?{0}?> processing instruction without a matching <?{1}?> after it.", beginInstruction, endInstruction);
+        }
+
+        public static Message OrderingReferenceLoopDetected(SourceLineNumber sourceLineNumbers, string loopList)
+        {
+            return Message(sourceLineNumbers, Ids.OrderingReferenceLoopDetected, "A circular reference of ordering dependencies was detected. The infinite loop includes: {0}. Ordering dependency references must form a directed acyclic graph.", loopList);
+        }
+
+        public static Message OrphanedComponent(SourceLineNumber sourceLineNumbers, string componentName)
+        {
+            return Message(sourceLineNumbers, Ids.OrphanedComponent, "Found orphaned Component '{0}'. If this is a Package, every Component must have at least one parent Feature. To include a Component in a Module, you must include it directly as a Component element of the Module element or indirectly via ComponentRef, ComponentGroup, or ComponentGroupRef elements.", componentName);
+        }
+
+        public static Message PathCannotContainQuote(string fileName)
+        {
+            return Message(null, Ids.PathCannotContainQuote, "Path '{0}' contains a literal quote character. Quotes are often accidentally introduced when trying to refer to a directory path with spaces in it, such as \"C:\\Out Directory\\\" -- the backslash before the quote acts an escape character. The correct representation for that path is: \"C:\\Out Directory\\\\\".", fileName);
+        }
+
+        public static Message PathTooLong(SourceLineNumber sourceLineNumbers, string fileName)
+        {
+            return Message(sourceLineNumbers, Ids.PathTooLong, "'{0}' is too long, the fully qualified file name must be less than 260 characters, and the directory name must be less than 248 characters.", fileName);
+        }
+
+        public static Message PreprocessorError(SourceLineNumber sourceLineNumbers, string message)
+        {
+            return Message(sourceLineNumbers, Ids.PreprocessorError, "{0}", message);
+        }
+
+        public static Message PreprocessorExtensionEvaluateFunctionFailed(SourceLineNumber sourceLineNumbers, string prefix, string function, string args, string message)
+        {
+            return Message(sourceLineNumbers, Ids.PreprocessorExtensionEvaluateFunctionFailed, "In the preprocessor extension that handles prefix '{0}' while trying to call function '{1}({2})' and exception has occurred : {3}", prefix, function, args, message);
+        }
+
+        public static Message PreprocessorExtensionGetVariableValueFailed(SourceLineNumber sourceLineNumbers, string prefix, string variable, string message)
+        {
+            return Message(sourceLineNumbers, Ids.PreprocessorExtensionGetVariableValueFailed, "In the preprocessor extension that handles prefix '{0}' while trying to get the value for variable '{1}' and exception has occured : {2}", prefix, variable, message);
+        }
+
+        public static Message PreprocessorExtensionPragmaFailed(SourceLineNumber sourceLineNumbers, string pragma, string message)
+        {
+            return Message(sourceLineNumbers, Ids.PreprocessorExtensionPragmaFailed, "Exception thrown while processing pragma '{0}'. The exception's message is: {1}", pragma, message);
+        }
+
+        public static Message ReferenceLoopDetected(SourceLineNumber sourceLineNumbers, string loopList)
+        {
+            return Message(sourceLineNumbers, Ids.ReferenceLoopDetected, "A circular reference of groups was detected. The infinite loop includes: {0}. Group references must form a directed acyclic graph.", loopList);
+        }
+
+        public static Message TooDeeplyIncluded(SourceLineNumber sourceLineNumbers, int depth)
+        {
+            return Message(sourceLineNumbers, Ids.TooDeeplyIncluded, "Include files cannot be nested more deeply than {0} times. Make sure included files don't accidentally include themselves.", depth);
+        }
+
+        public static Message UnauthorizedAccess(string filePath)
+        {
+            return Message(null, Ids.UnauthorizedAccess, "Access to the path '{0}' is denied.", filePath);
+        }
+
+        public static Message UndefinedPreprocessorFunction(SourceLineNumber sourceLineNumbers, string variableName)
+        {
+            return Message(sourceLineNumbers, Ids.UndefinedPreprocessorFunction, "Undefined preprocessor function '$({0})'.", variableName);
+        }
+
+        public static Message UndefinedPreprocessorVariable(SourceLineNumber sourceLineNumbers, string variableName)
+        {
+            return Message(sourceLineNumbers, Ids.UndefinedPreprocessorVariable, "Undefined preprocessor variable '$({0})'.", variableName);
+        }
+
+        public static Message UnexpectedEmptySubexpression(SourceLineNumber sourceLineNumbers, string expression)
+        {
+            return Message(sourceLineNumbers, Ids.UnexpectedEmptySubexpression, "The empty subexpression is unexpected in the expression '{0}'.", expression);
+        }
+
+        public static Message UnexpectedLiteral(SourceLineNumber sourceLineNumbers, string expression)
+        {
+            return Message(sourceLineNumbers, Ids.UnexpectedLiteral, "An unexpected literal was found in the expression '{0}'.", expression);
+        }
+
+        public static Message UnexpectedPreprocessorOperator(SourceLineNumber sourceLineNumbers, string op)
+        {
+            return Message(sourceLineNumbers, Ids.UnexpectedPreprocessorOperator, "The operator '{0}' is unexpected.", op);
+        }
+
+        public static Message UnhandledExtensionAttribute(SourceLineNumber sourceLineNumbers, string elementName, string extensionAttributeName, string extensionNamespace)
+        {
+            return Message(sourceLineNumbers, Ids.UnhandledExtensionAttribute, "The {0} element contains an unhandled extension attribute '{1}'. Please ensure that the extension for attributes in the '{2}' namespace has been provided.", elementName, extensionAttributeName, extensionNamespace);
+        }
+
+        public static Message UnhandledExtensionElement(SourceLineNumber sourceLineNumbers, string elementName, string extensionElementName, string extensionNamespace)
+        {
+            return Message(sourceLineNumbers, Ids.UnhandledExtensionElement, "The {0} element contains an unhandled extension element '{1}'. Please ensure that the extension for elements in the '{2}' namespace has been provided.", elementName, extensionElementName, extensionNamespace);
+        }
+
+        public static Message UnmatchedParenthesisInExpression(SourceLineNumber sourceLineNumbers, string expression)
+        {
+            return Message(sourceLineNumbers, Ids.UnmatchedParenthesisInExpression, "The parenthesis don't match in the expression '{0}'.", expression);
+        }
+
+        public static Message UnmatchedPreprocessorInstruction(SourceLineNumber sourceLineNumbers, string beginInstruction, string endInstruction)
+        {
+            return Message(sourceLineNumbers, Ids.UnmatchedPreprocessorInstruction, "Found a <?{1}?> processing instruction without a matching <?{0}?> before it.", beginInstruction, endInstruction);
+        }
+
+        public static Message UnmatchedQuotesInExpression(SourceLineNumber sourceLineNumbers, string expression)
+        {
+            return Message(sourceLineNumbers, Ids.UnmatchedQuotesInExpression, "The quotes don't match in the expression '{0}'.", expression);
+        }
+
+        public static Message UnresolvedBindReference(SourceLineNumber sourceLineNumbers, string BindRef)
+        {
+            return Message(sourceLineNumbers, Ids.UnresolvedBindReference, "Unresolved bind-time variable {0}.", BindRef);
+        }
+
+        public static Message UnresolvedReference(SourceLineNumber sourceLineNumbers, string symbolName)
+        {
+            return Message(sourceLineNumbers, Ids.UnresolvedReference, "The identifier '{0}' could not be found. Ensure you have typed the reference correctly and that all the necessary inputs are provided to the linker.", symbolName);
+        }
+
+        public static Message UnresolvedReference(SourceLineNumber sourceLineNumbers, string symbolName, WixToolset.Data.AccessModifier accessModifier)
+        {
+            return Message(sourceLineNumbers, Ids.UnresolvedReference, "The identifier '{0}' is inaccessible due to its protection level.", symbolName, accessModifier);
+        }
+
+        public static Message UnsupportedExtensionAttribute(SourceLineNumber sourceLineNumbers, string elementName, string extensionElementName)
+        {
+            return Message(sourceLineNumbers, Ids.UnsupportedExtensionAttribute, "The {0} element contains an unsupported extension attribute '{1}'. The {0} element does not currently support extension attributes. Is the {1} attribute using the correct XML namespace?", elementName, extensionElementName);
+        }
+
+        public static Message UnsupportedExtensionElement(SourceLineNumber sourceLineNumbers, string elementName, string extensionElementName)
+        {
+            return Message(sourceLineNumbers, Ids.UnsupportedExtensionElement, "The {0} element contains an unsupported extension element '{1}'. The {0} element does not currently support extension elements. Is the {1} element using the correct XML namespace?", elementName, extensionElementName);
+        }
+
+        public static Message BindVariableCollision(SourceLineNumber sourceLineNumbers, string variableId)
+        {
+            return Message(sourceLineNumbers, Ids.BindVariableCollision, "The bind variable '{0}' is declared in more than one location. Please remove one of the declarations.", variableId);
+        }
+
+        public static Message BindVariableUnknown(SourceLineNumber sourceLineNumbers, string variableId)
+        {
+            return Message(sourceLineNumbers, Ids.BindVariableUnknown, "The bind variable !(wix.{0}) is unknown. Please ensure the variable is declared on the command line for wix.exe, via a WixVariable element, or inline using the syntax !(wix.{0}=some value which doesn't contain parentheses).", variableId);
+        }
+
+        public static Message NoSourceFiles()
+        {
+            return Message(null, Ids.NoSourceFiles, "No source files specified.");
+        }
+
+        public static Message IllegalInnerText(SourceLineNumber sourceLineNumbers, string elementName, string innerText)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalInnerText, "The {0} element contains illegal inner text: '{1}'.", elementName, innerText);
+        }
+
+        public static Message IllegalInnerText(SourceLineNumber sourceLineNumbers, string elementName, string /*innerText*/_, string attributeName)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalInnerText, "The {0} element contains inner text which is obsolete. Use the {1} attribute instead.", elementName, attributeName);
+        }
+
+        public static Message ActionScheduledRelativeToItself(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue)
+        {
+            return Message(sourceLineNumbers, Ids.ActionScheduledRelativeToItself, "The {0}/@{1} attribute's value '{2}' is invalid because it would make this action dependent upon itself. Please change the value to the name of a different action.", elementName, attributeName, attributeValue);
+        }
+
+        public static Message AdvertiseStateMustMatch(SourceLineNumber sourceLineNumbers, string advertiseState, string parentAdvertiseState)
+        {
+            return Message(sourceLineNumbers, Ids.AdvertiseStateMustMatch, "The advertise state of this element: '{0}', does not match the advertise state set on the parent element: '{1}'.", advertiseState, parentAdvertiseState);
+        }
+
+        public static Message AppIdIncompatibleAdvertiseState(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, string parentValue)
+        {
+            return Message(sourceLineNumbers, Ids.AppIdIncompatibleAdvertiseState, "The {0}/@(1) attribute's value, '{2}' does not match the advertise state on its parent element: '{3}'. (Note: AppIds nested under Fragment, Module, or Package elements must be advertised.)", elementName, attributeName, value, parentValue);
+        }
+
+        public static Message CannotAuthorSpecialProperties(SourceLineNumber sourceLineNumbers, string propertyName)
+        {
+            return Message(sourceLineNumbers, Ids.CannotAuthorSpecialProperties, "The {0} property was specified. Special MSI properties cannot be authored. Use the attributes on the Property element instead.", propertyName);
+        }
+
+        public static Message CannotDefaultComponentId(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.CannotDefaultComponentId, "The Component/@Id attribute was not found; it is required when there is no valid keypath to use as the default id value.");
+        }
+
+        public static Message CannotDefaultMismatchedAdvertiseStates(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.CannotDefaultMismatchedAdvertiseStates, "MIME element cannot be marked as the default when its advertise state differs from its parent element. Ensure that the advertise state of the MIME element matches its parents element or remove the Mime/@Advertise attribute completely.");
+        }
+
+        public static Message CanNotHaveTwoParents(SourceLineNumber sourceLineNumbers, string directorySearch, string parentAttribute, string parentElement)
+        {
+            return Message(sourceLineNumbers, Ids.CanNotHaveTwoParents, "The DirectorySearchRef {0} can not have a Parent attribute {1} and also be nested under parent element {2}", directorySearch, parentAttribute, parentElement);
+        }
+
+        public static Message ComponentMultipleKeyPaths(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, string fileElementName, string registryElementName, string odbcDataSourceElementName)
+        {
+            return Message(sourceLineNumbers, Ids.ComponentMultipleKeyPaths, "The {0} element has multiple key paths set. The key path may only be set to '{2}' in extension elements that support it or one of the following locations: {0}/@{1}, {3}/@{1}, {4}/@{1}, or {5}/@{1}.", elementName, attributeName, value, fileElementName, registryElementName, odbcDataSourceElementName);
+        }
+
+        public static Message CustomActionMultipleSources(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeName1, string attributeName2, string attributeName3, string attributeName4, string attributeName5)
+        {
+            return Message(sourceLineNumbers, Ids.CustomActionMultipleSources, "The {0}/@{1} attribute cannot coexist with a previously specified attribute on this element. The {0} element may only have one of the following source attributes specified at a time: {2}, {3}, {4}, {5}, or {6}.", elementName, attributeName, attributeName1, attributeName2, attributeName3, attributeName4, attributeName5);
+        }
+
+        public static Message CustomActionMultipleTargets(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeName1, string attributeName2, string attributeName3, string attributeName4, string attributeName5, string attributeName6, string attributeName7)
+        {
+            return Message(sourceLineNumbers, Ids.CustomActionMultipleTargets, "The {0}/@{1} attribute cannot coexist with a previously specified attribute on this element. The {0} element may only have one of the following target attributes specified at a time: {2}, {3}, {4}, {5}, {6}, {7}, or {8}.", elementName, attributeName, attributeName1, attributeName2, attributeName3, attributeName4, attributeName5, attributeName6, attributeName7);
+        }
+
+        public static Message CustomTableIllegalColumnWidth(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, int value)
+        {
+            return Message(sourceLineNumbers, Ids.CustomTableIllegalColumnWidth, "The {0}/@{1} attribute's value, '{2}', is not a valid column width. Valid column widths are 2 or 4.", elementName, attributeName, value);
+        }
+
+        public static Message CustomTableMissingPrimaryKey(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.CustomTableMissingPrimaryKey, "The CustomTable is missing a Column element with the PrimaryKey attribute set to 'yes'. At least one column must be marked as the primary key.");
+        }
+
+        public static Message CustomTableNameTooLong(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.CustomTableNameTooLong, "The {0}/@{1} attribute's value, '{2}', is too long for a table name. It cannot be more than than 31 characters long.", elementName, attributeName, value);
+        }
+
+        public static Message DuplicateContextValue(SourceLineNumber sourceLineNumbers, string contextValue)
+        {
+            return Message(sourceLineNumbers, Ids.DuplicateContextValue, "The context value '{0}' was duplicated. Context values must be distinct.", contextValue);
+        }
+
+        public static Message DuplicateExtensionXmlSchemaNamespace(string extension, string extensionXmlSchemaNamespace, string collidingExtension)
+        {
+            return Message(null, Ids.DuplicateExtensionXmlSchemaNamespace, "The extension '{0}' uses the same xml schema namespace, '{1}', as previously loaded extension '{2}'. Please either remove one of the extensions or rename the xml schema namespace to avoid the collision.", extension, extensionXmlSchemaNamespace, collidingExtension);
+        }
+
+        public static Message ExpectedBinaryCategory(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.ExpectedBinaryCategory, "The Column element specifies a binary column but does not have the correct Category specified. Windows Installer requires binary columns to specify their category as binary. Please set the Category attribute's value to 'Binary'.");
+        }
+
+        public static Message ExpectedSignedCabinetName(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.ExpectedSignedCabinetName, "The Media/@Cabinet attribute was not found; it is required when this element contains a DigitalSignature child element. This is because Windows Installer can only verify the digital signatures of external cabinets. Please either remove the DigitalSignature element or specify a valid external cabinet name via the Cabinet attribute.");
+        }
+
+        public static Message FeatureCannotFavorAndDisallowAdvertise(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, string otherAttributeName, string otherValue)
+        {
+            return Message(sourceLineNumbers, Ids.FeatureCannotFavorAndDisallowAdvertise, "The {0}/@{1} attribute's value, '{2}', cannot coexist with the {3} attribute's value of '{4}'. These options would ask the installer to disallow the advertised state for this feature while at the same time favoring it.", elementName, attributeName, value, otherAttributeName, otherValue);
+        }
+
+        public static Message FeatureConfigurableDirectoryNotUppercase(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.FeatureConfigurableDirectoryNotUppercase, "The {0}/@{1} attribute's value, '{2}', contains lowercase characters. Since this directory is user-configurable, it needs to be a public property. This means the value must be completely uppercase.", elementName, attributeName, value);
+        }
+
+        public static Message FeatureNameTooLong(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue)
+        {
+            return Message(sourceLineNumbers, Ids.FeatureNameTooLong, "The {0}/@{1} attribute with value '{2}', is too long for a feature name. Due to limitations in the Windows Installer, feature names cannot be longer than 38 characters in length.", elementName, attributeName, attributeValue);
+        }
+
+        public static Message IllegalAttributeInMergeModule(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalAttributeInMergeModule, "The {0}/@{1} attribute cannot be specified in a merge module.", elementName, attributeName);
+        }
+
+        public static Message IllegalAttributeWhenAdvertised(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalAttributeWhenAdvertised, "The {0}/@{1} attribute cannot be specified because the element is advertised.", elementName, attributeName);
+        }
+
+        public static Message IllegalCodepageAttribute(SourceLineNumber sourceLineNumbers, string codepage, string elementName, string attributeName)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalCodepageAttribute, "The code page '{0}' is not a valid Windows code page. Please check the {1}/@{2} attribute value in your source file.", codepage, elementName, attributeName);
+        }
+
+        public static Message IllegalCompressionLevel(SourceLineNumber sourceLineNumbers, string compressionLevel)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalCompressionLevel, "The compression level '{0}' is not valid. Valid values are 'none', 'low', 'medium', 'high', and 'mszip'.", compressionLevel);
+        }
+
+        public static Message IllegalModuleExclusionLanguageAttributes(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalModuleExclusionLanguageAttributes, "Cannot set both ExcludeLanguage and ExcludeExceptLanguage attributes on a ModuleExclusion element.");
+        }
+
+        public static Message IllegalPropertyCustomActionAttributes(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalPropertyCustomActionAttributes, "The CustomAction sets a property but its Execute attribute is not 'immediate' (the default). Property-setting custom actions cannot be deferred.\"");
+        }
+
+        public static Message IllegalSearchIdForParentDepth(SourceLineNumber sourceLineNumbers, string id, string parentId)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalSearchIdForParentDepth, "When the parent DirectorySearch/@Depth attribute is greater than 1 for the DirectorySearch '{1}', the FileSearch/@Id attribute must be absent for FileSearch '{0}' unless the parent DirectorySearch/@AssignToProperty attribute value is 'yes'. Remove the FileSearch/@Id attribute for '{0}' to resolve this issue.", id, parentId);
+        }
+
+        public static Message IllegalShortFilename(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalShortFilename, "The {0}/@{1} attribute's value, '{2}', is not a valid 8.3-compliant name. Legal names contain no more than 8 non-period characters followed by an optional period and extension of no more than 3 non-period characters. Any character except for the follow may be used: \\ ? | > < : / * \" + , ; = [ ] (space).", elementName, attributeName, value);
+        }
+
+        public static Message IllegalTargetDirDefaultDir(SourceLineNumber sourceLineNumbers, string defaultDir)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalTargetDirDefaultDir, "The 'TARGETDIR' directory has an illegal DefaultDir value of '{0}'. The DefaultDir value is created from the *Name attributes of the Directory element. The TARGETDIR directory is a special directory which must have its Name attribute set to 'SourceDir'.", defaultDir);
+        }
+
+        public static Message IllegalTerminalServerCustomActionAttributes(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalTerminalServerCustomActionAttributes, "The CustomAction/@TerminalServerAware attribute's value is 'yes' but the Execute attribute is not 'deferred,' 'rollback,' or 'commit.' Terminal-Server-aware custom actions must be deferred, rollback, or commit custom actions. For more information, see https://learn.microsoft.com/en-us/windows/win32/msi/terminalserver .\"");
+        }
+
+        public static Message ImplicitComponentKeyPath(SourceLineNumber sourceLineNumbers, string componentId)
+        {
+            return Message(sourceLineNumbers, Ids.ImplicitComponentKeyPath, "The component '{0}' does not have an explicit key path specified. If the ordering of the elements under the Component element changes, the key path will also change. To prevent accidental changes, the key path should be set to 'yes' in one of the following locations: Component/@KeyPath, File/@KeyPath, ODBCDataSource/@KeyPath, or Registry/@KeyPath.", componentId);
+        }
+
+        public static Message InsufficientVersion(SourceLineNumber sourceLineNumbers, Version currentVersion, Version requiredVersion)
+        {
+            return Message(sourceLineNumbers, Ids.InsufficientVersion, "The current version of the toolset is {0}, but version {1} is required.", currentVersion, requiredVersion);
+        }
+
+        public static Message InsufficientVersion(SourceLineNumber sourceLineNumbers, Version currentVersion, Version requiredVersion, string extension)
+        {
+            return Message(sourceLineNumbers, Ids.InsufficientVersion, "The current version of the extension '{2}' is {0}, but version {1} is required.", currentVersion, requiredVersion, extension);
+        }
+
+        public static Message InvalidCabinetTemplate(SourceLineNumber sourceLineNumbers, string cabinetTemplate)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidCabinetTemplate, "CabinetTemplate attribute's value '{0}' must contain '{{0}}' and should contain no more than 8 characters followed by an optional extension of no more than 3 characters. Any character except for the follow 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).", cabinetTemplate);
+        }
+
+        public static Message InvalidDateTimeFormat(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidDateTimeFormat, "The {0}/@{1} attribute's value '{2}' is not a valid date/time value. A date/time value should follow the format YYYY-MM-DDTHH:mm:ss and be a valid date and time between 1980 and 2043, inclusive.", elementName, attributeName, value);
+        }
+
+        public static Message InvalidEmbeddedUIFileName(SourceLineNumber sourceLineNumbers, string codepage)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidEmbeddedUIFileName, "The EmbeddedUI/@Name attribute value, '{0}', does not contain an extension. Windows Installer will not load an embedded UI DLL without an extension. Include an extension or just omit the Name attribute so it defaults to the file name portion of the Source attribute value.", codepage);
+        }
+
+        public static Message MediaEmbeddedCabinetNameTooLong(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value, int length)
+        {
+            return Message(sourceLineNumbers, Ids.MediaEmbeddedCabinetNameTooLong, "The {0}/@{1} attribute's value, '{2}', is {3} characters long. The name is too long for an embedded cabinet. It cannot be more than than 62 characters long.", elementName, attributeName, value, length);
+        }
+
+        public static Message MissingTypeLibFile(SourceLineNumber sourceLineNumbers, string elementName, string fileElementName)
+        {
+            return Message(sourceLineNumbers, Ids.MissingTypeLibFile, "The {0} element is non-advertised and therefore requires a parent {1} element.", elementName, fileElementName);
+        }
+
+        public static Message MultipleIdentifiersFound(SourceLineNumber sourceLineNumbers, string elementName, string identifier, string mismatchIdentifier)
+        {
+            return Message(sourceLineNumbers, Ids.MultipleIdentifiersFound, "Under a '{0}' element, multiple identifiers were found: '{1}' and '{2}'. All search elements under this element must have the same id.", elementName, identifier, mismatchIdentifier);
+        }
+
+        public static Message NeedSequenceBeforeOrAfter(SourceLineNumber sourceLineNumbers, string elementName)
+        {
+            return Message(sourceLineNumbers, Ids.NeedSequenceBeforeOrAfter, "A {0} element must have a Before attribute, After attribute, or a Sequence attribute.", elementName);
+        }
+
+        public static Message NoFirstControlSpecified(SourceLineNumber sourceLineNumbers, string dialogName)
+        {
+            return Message(sourceLineNumbers, Ids.NoFirstControlSpecified, "The '{0}' dialog element does not have a valid tabbable control. You must either have a tabbable control that is not marked TabSkip='yes', or you must mark a control TabSkip='no'. If you have a page with no tabbable controls (a progress page, for example), you might want to set the first Text control to be TabSkip='no'.", dialogName);
+        }
+
+        public static Message ParentElementAttributeRequired(SourceLineNumber sourceLineNumbers, string parentElement, string parentAttribute, string childElement)
+        {
+            return Message(sourceLineNumbers, Ids.ParentElementAttributeRequired, "The parent {0} element is missing the {1} attribute that is required for the {2} child element.", parentElement, parentAttribute, childElement);
+        }
+
+        public static Message ProgIdNestedTooDeep(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.ProgIdNestedTooDeep, "ProgId elements may not be nested more than 1 level deep.");
+        }
+
+        public static Message RadioButtonBitmapAndIconDisallowed(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.RadioButtonBitmapAndIconDisallowed, "RadioButtonGroup elements that contain RadioButton elements with Bitmap or Icon attributes set to \"yes\" can only be specified under a Control element. Move your RadioButtonGroup element as a child of the appropriate Control element.");
+        }
+
+        public static Message RadioButtonTypeInconsistent(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.RadioButtonTypeInconsistent, "All RadioButton elements in a RadioButtonGroup must be consistent with their use of the Bitmap, Icon, and Text attributes. Ensure all of the RadioButton elements in this group have the same attribute specified.");
+        }
+
+        public static Message RegistryMultipleValuesWithoutMultiString(SourceLineNumber sourceLineNumbers, string registryElementName, string valueAttributeName, string registryValueElementName, string typeAttributeName)
+        {
+            return Message(sourceLineNumbers, Ids.RegistryMultipleValuesWithoutMultiString, "The {0}/@{1} attribute and a {0}/{2} element cannot both be specified. Only one may be specified if the {3} attribute's value is not 'multiString'.", registryElementName, valueAttributeName, registryValueElementName, typeAttributeName);
+        }
+
+        public static Message RegistryNameValueIncorrect(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.RegistryNameValueIncorrect, "The {0}/@{1} attribute's value, '{2}', is incorrect. It should not contain values of '+', '-', or '*' when the {0}/@Value attribute is empty. Instead, use the proper element and attributes: for Name='+' use RegistryKey/@Action='createKey', for Name='-' use RemoveRegistryKey/@Action='removeOnUninstall', for Name='*' use RegistryKey/@Action='createAndRemoveOnUninstall'.", elementName, attributeName, value);
+        }
+
+        public static Message RegistryRootInvalid(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.RegistryRootInvalid, "Registry/@Root attribute is invalid on a nested Registry element. Either remove the Root attribute or move the Registry element so it is not nested under another Registry element.");
+        }
+
+        public static Message RelativePathForRegistryElement(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.RelativePathForRegistryElement, "Cannot convert RelativePath into Registry elements.");
+        }
+
+        public static Message RootFeatureCannotFollowParent(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.RootFeatureCannotFollowParent, "The Feature element specifies a root feature with an illegal InstallDefault value of 'followParent'. Root features cannot follow their parent feature's install state because they don't have a parent feature. Please remove or change the value of the InstallDefault attribute.");
+        }
+
+        public static Message SearchElementRequired(SourceLineNumber sourceLineNumbers, string elementName)
+        {
+            return Message(sourceLineNumbers, Ids.SearchElementRequired, "A '{0}' element must have a search element as a child.", elementName);
+        }
+
+        public static Message SearchElementRequiredWithAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue)
+        {
+            return Message(sourceLineNumbers, Ids.SearchElementRequiredWithAttribute, "A {0} element must have a search element as a child when the {0}/@{1} attribute has the value '{2}'.", elementName, attributeName, attributeValue);
+        }
+
+        public static Message SearchPropertyNotUppercase(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.SearchPropertyNotUppercase, "The {0}/@{1} attribute's value, '{2}', cannot contain lowercase characters. Since this is a search property, it must also be a public property. This means the Property/@Id value must be completely uppercase.", elementName, attributeName, value);
+        }
+
+        public static Message SecurePropertyNotUppercase(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string propertyId)
+        {
+            return Message(sourceLineNumbers, Ids.SecurePropertyNotUppercase, "The {0}/@{1} attribute's value, '{2}', cannot contain lowercase characters. Since this is a secure property, it must also be a public property. This means the Property/@Id value must be completely uppercase.", elementName, attributeName, propertyId);
+        }
+
+        public static Message SignedEmbeddedCabinet(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.SignedEmbeddedCabinet, "The DigitalSignature element cannot be nested under a Media element which specifies EmbedCab='yes'. This is because Windows Installer can only verify the digital signatures of external cabinets. Please either remove the DigitalSignature element or change the value of the Media/@EmbedCab attribute to 'no'.");
+        }
+
+        public static Message TabbableControlNotAllowedInBillboard(SourceLineNumber sourceLineNumbers, string elementName, string controlType)
+        {
+            return Message(sourceLineNumbers, Ids.TabbableControlNotAllowedInBillboard, "A {0} element was specified with Type='{1}' and TabSkip='no'. Tabbable controls are not allowed in Billboards.", elementName, controlType);
+        }
+
+        public static Message TableNameTooLong(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
+        {
+            return Message(sourceLineNumbers, Ids.TableNameTooLong, "The {0}/@{1} attribute's value, '{2}', is too long for a table name. It cannot be more than than 31 characters long.", elementName, attributeName, value);
+        }
+
+        public static Message TooManyChildren(SourceLineNumber sourceLineNumbers, string elementName, string childElementName)
+        {
+            return Message(sourceLineNumbers, Ids.TooManyChildren, "The {0} element contains multiple {1} child elements. There can only be one {1} child element per {0} element.", elementName, childElementName);
+        }
+
+        public static Message TooManySearchElements(SourceLineNumber sourceLineNumbers, string elementName)
+        {
+            return Message(sourceLineNumbers, Ids.TooManySearchElements, "Only one search element can appear under a '{0}' element.", elementName);
+        }
+
+        public static Message UniqueFileSearchIdRequired(SourceLineNumber sourceLineNumbers, string id, string elementName)
+        {
+            return Message(sourceLineNumbers, Ids.UniqueFileSearchIdRequired, "The DirectorySearch element '{0}' requires that the child {1} element has a unique Id when the DirectorySearch/@AssignToProperty attribute is set to 'yes'.", id, elementName);
+        }
+
+        public static Message ValueAndMaskMustBeSameLength(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.ValueAndMaskMustBeSameLength, "The FileTypeMask/@Value and FileTypeMask/@Mask attributes must be the same length.");
+        }
+
+        public static Message ValueNotSupported(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string attributeValue)
+        {
+            return Message(sourceLineNumbers, Ids.ValueNotSupported, "The {0}/@{1} attribute's value, '{2}, is not supported by the Windows Installer.", elementName, attributeName, attributeValue);
+        }
+
+        public static Message VersionIndependentProgIdsCannotHaveIcons(SourceLineNumber sourceLineNumbers)
+        {
+            return Message(sourceLineNumbers, Ids.VersionIndependentProgIdsCannotHaveIcons, "Version independent ProgIds cannot have Icons. Remove the Icon and/or IconIndex attributes from your ProgId element.");
+        }
+
         private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
         {
             return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args);
@@ -38,6 +775,144 @@ namespace WixToolset.Core
 
         public enum Ids
         {
+            InsufficientVersion = 7,
+            SecurePropertyNotUppercase = 11,
+            SearchPropertyNotUppercase = 12,
+            AppIdIncompatibleAdvertiseState = 18,
+            IllegalAttributeWhenAdvertised = 19,
+            CustomActionMultipleSources = 22,
+            CustomActionMultipleTargets = 23,
+            IllegalShortFilename = 26,
+            TableNameTooLong = 28,
+            FeatureConfigurableDirectoryNotUppercase = 29,
+            FeatureCannotFavorAndDisallowAdvertise = 30,
+            MediaEmbeddedCabinetNameTooLong = 32,
+            RegistryMultipleValuesWithoutMultiString = 34,
+            ExampleGuid = 40,
+            TooManyChildren = 41,
+            ComponentMultipleKeyPaths = 42,
+            MissingTypeLibFile = 47,
+            UnauthorizedAccess = 50,
+            IllegalModuleExclusionLanguageAttributes = 51,
+            NoFirstControlSpecified = 52,
+            ValueAndMaskMustBeSameLength = 54,
+            TooManySearchElements = 55,
+            SearchElementRequired = 57,
+            MultipleIdentifiersFound = 58,
+            AdvertiseStateMustMatch = 59,
+            DuplicateContextValue = 60,
+            RelativePathForRegistryElement = 61,
+            RegistryRootInvalid = 64,
+            IllegalYesNoDefaultValue = 65,
+            IllegalAttributeInMergeModule = 66,
+            SearchElementRequiredWithAttribute = 69,
+            CannotAuthorSpecialProperties = 70,
+            NeedSequenceBeforeOrAfter = 72,
+            ValueNotSupported = 73,
+            TabbableControlNotAllowedInBillboard = 74,
+            RadioButtonTypeInconsistent = 77,
+            RadioButtonBitmapAndIconDisallowed = 78,
+            IllegalSuppressWarningId = 79,
+            ReferenceLoopDetected = 86,
+            InvalidDateTimeFormat = 88,
+            MultipleEntrySections = 89,
+            MultipleEntrySections2 = 90,
+            MissingEntrySection = 93,
+            UnresolvedReference = 94,
+            MultiplePrimaryReferences = 95,
+            ComponentReferencedTwice = 96,
+            ImplicitComponentKeyPath = 99,
+            DuplicateLocalizationIdentifier = 100,
+            LocalizationVariableUnknown = 102,
+            ProgIdNestedTooDeep = 105,
+            CanNotHaveTwoParents = 106,
+            CustomTableNameTooLong = 109,
+            CustomTableIllegalColumnWidth = 110,
+            CustomTableMissingPrimaryKey = 111,
+            PathCannotContainQuote = 117,
+            AdditionalArgumentUnexpected = 118,
+            RegistryNameValueIncorrect = 119,
+            IllegalLongValue = 122,
+            DuplicateExtensionXmlSchemaNamespace = 125,
+            DuplicateExtensionPreprocessorType = 127,
+            FileInUse = 128,
+            ExpectedDirectory = 138,
+            ComponentExpectedFeature = 139,
+            InvalidExtension = 144,
+            InvalidSubExpression = 145,
+            UnmatchedPreprocessorInstruction = 146,
+            NonterminatedPreprocessorInstruction = 147,
+            ExpectedExpressionAfterNot = 148,
+            InvalidPreprocessorVariable = 149,
+            UndefinedPreprocessorVariable = 150,
+            IllegalDefineStatement = 151,
+            CannotReundefineVariable = 153,
+            IllegalForeach = 154,
+            ExpectedEndforeach = 156,
+            UnmatchedQuotesInExpression = 158,
+            UnmatchedParenthesisInExpression = 159,
+            ExpectedVariable = 160,
+            UnexpectedLiteral = 161,
+            IllegalIntegerInExpression = 162,
+            UnexpectedPreprocessorOperator = 163,
+            UnexpectedEmptySubexpression = 164,
+            ActionScheduledRelativeToItself = 181,
+            CannotDefaultMismatchedAdvertiseStates = 191,
+            VersionIndependentProgIdsCannotHaveIcons = 192,
+            BindVariableCollision = 195,
+            BindVariableUnknown = 197,
+            UnhandledExtensionElement = 200,
+            UnhandledExtensionAttribute = 201,
+            UnsupportedExtensionAttribute = 202,
+            UnsupportedExtensionElement = 203,
+            IllegalTargetDirDefaultDir = 206,
+            ExpectedBinaryCategory = 208,
+            RootFeatureCannotFollowParent = 209,
+            FeatureNameTooLong = 210,
+            SignedEmbeddedCabinet = 211,
+            ExpectedSignedCabinetName = 212,
+            IllegalInlineLocVariable = 213,
+            MergeModuleExpectedFeature = 215,
+            IllegalTerminalServerCustomActionAttributes = 232,
+            IllegalPropertyCustomActionAttributes = 233,
+            InvalidPreprocessorFunction = 234,
+            UndefinedPreprocessorFunction = 235,
+            PreprocessorExtensionEvaluateFunctionFailed = 236,
+            PreprocessorExtensionGetVariableValueFailed = 237,
+            PreprocessorError = 250,
+            ExpectedArgument = 251,
+            PathTooLong = 262,
+            OrphanedComponent = 267,
+            IllegalIdentifierLooksLikeFormatted = 275,
+            IllegalCodepageAttribute = 276,
+            IllegalCompressionLevel = 277,
+            ExpectedDirectoryGotFile = 280,
+            ExpectedFileGotDirectory = 281,
+            InvalidCommandLineFileName = 284,
+            IllegalWarningIdAsError = 286,
+            DuplicateVariableDefinition = 288,
+            UnresolvedBindReference = 298,
+            MustSpecifyOutputWithMoreThanOneInput = 302,
+            IllegalSearchIdForParentDepth = 303,
+            InvalidEmbeddedUIFileName = 312,
+            UniqueFileSearchIdRequired = 313,
+            CannotDefaultComponentId = 330,
+            ParentElementAttributeRequired = 331,
+            PreprocessorExtensionPragmaFailed = 333,
+            InvalidPreprocessorPragma = 334,
+            OrderingReferenceLoopDetected = 343,
+            IllegalAttributeValueWithIllegalList = 348,
+            InvalidSummaryInfoCodePage = 349,
+            InvalidCabinetTemplate = 358,
+            DisallowedMsiProperty = 365,
+            DuplicatedUiLocalization = 374,
+            InvalidPreprocessorFunctionAutoVersion = 379,
+            TooDeeplyIncluded = 385,
+            NoSourceFiles = 391,
+            WixiplSourceFileIsExclusive = 392,
+            IntermediatesMustBeCompiled = 395,
+            IllegalInnerText = 400,
+            InvalidBundleCondition = 409,
             UnableToCopyFile = 7010,
             UnableToDeleteFile = 7011,
             UnableToMoveFile = 7012,
@@ -46,3 +921,4 @@ namespace WixToolset.Core
         } // last available is 7099. 7100 is WindowsInstallerBackendWarnings.
     }
 }
+
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/BundleValidator.cs b/src/wix/WixToolset.Core/ExtensibilityServices/BundleValidator.cs
index 6533d159..77ab4ed7 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/BundleValidator.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/BundleValidator.cs
@@ -7,6 +7,7 @@ namespace WixToolset.Core.ExtensibilityServices
     using System.Diagnostics;
     using System.IO;
     using System.Text;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
@@ -188,7 +189,7 @@ namespace WixToolset.Core.ExtensibilityServices
             else if (BuiltinBundleVariables.Contains(variableName))
             {
                 var illegalValues = CreateValueList(ValueListKind.Or, BuiltinBundleVariables);
-                this.Messaging.Write(ErrorMessages.IllegalAttributeValueWithIllegalList(sourceLineNumbers, elementName, attributeName, variableName, illegalValues));
+                this.Messaging.Write(CoreErrors.IllegalAttributeValueWithIllegalList(sourceLineNumbers, elementName, attributeName, variableName, illegalValues));
 
                 return false;
             }
@@ -218,7 +219,7 @@ namespace WixToolset.Core.ExtensibilityServices
                 if (!allowed)
                 {
                     var illegalValues = CreateValueList(ValueListKind.Or, BuiltinBundleVariables);
-                    this.Messaging.Write(ErrorMessages.IllegalAttributeValueWithIllegalList(sourceLineNumbers, elementName, attributeName, variableName, illegalValues));
+                    this.Messaging.Write(CoreErrors.IllegalAttributeValueWithIllegalList(sourceLineNumbers, elementName, attributeName, variableName, illegalValues));
                 }
 
                 return allowed;
@@ -231,7 +232,7 @@ namespace WixToolset.Core.ExtensibilityServices
                 if (!allowed)
                 {
                     var illegalValues = CreateValueList(ValueListKind.Or, WellKnownBundleVariables);
-                    this.Messaging.Write(ErrorMessages.IllegalAttributeValueWithIllegalList(sourceLineNumbers, elementName, attributeName, variableName, illegalValues));
+                    this.Messaging.Write(CoreErrors.IllegalAttributeValueWithIllegalList(sourceLineNumbers, elementName, attributeName, variableName, illegalValues));
                 }
 
                 return allowed;
@@ -259,7 +260,7 @@ namespace WixToolset.Core.ExtensibilityServices
             else if (BuiltinBundleVariables.Contains(variableName))
             {
                 var illegalValues = CreateValueList(ValueListKind.Or, BuiltinBundleVariables);
-                this.Messaging.Write(ErrorMessages.IllegalAttributeValueWithIllegalList(sourceLineNumbers, elementName, attributeName, variableName, illegalValues));
+                this.Messaging.Write(CoreErrors.IllegalAttributeValueWithIllegalList(sourceLineNumbers, elementName, attributeName, variableName, illegalValues));
 
                 return false;
             }
@@ -292,7 +293,7 @@ namespace WixToolset.Core.ExtensibilityServices
             else if (DisallowedMsiProperties.Contains(propertyName))
             {
                 var illegalValues = CreateValueList(ValueListKind.Or, DisallowedMsiProperties);
-                this.Messaging.Write(ErrorMessages.DisallowedMsiProperty(sourceLineNumbers, propertyName, illegalValues));
+                this.Messaging.Write(CoreErrors.DisallowedMsiProperty(sourceLineNumbers, propertyName, illegalValues));
 
                 return false;
             }
@@ -360,7 +361,7 @@ namespace WixToolset.Core.ExtensibilityServices
             //TODO: Actually parse the condition to definitively tell which Variables are referenced.
             else if (condition.Trim() == "=")
             {
-                this.Messaging.Write(ErrorMessages.InvalidBundleCondition(sourceLineNumbers, elementName, attributeName, condition));
+                this.Messaging.Write(CoreErrors.InvalidBundleCondition(sourceLineNumbers, elementName, attributeName, condition));
                 return false;
             }
             else
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs b/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
index cad4edc0..4a08ff63 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/ExtensionManager.cs
@@ -7,6 +7,7 @@ namespace WixToolset.Core.ExtensibilityServices
     using System.IO;
     using System.Linq;
     using System.Reflection;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
@@ -41,7 +42,7 @@ namespace WixToolset.Core.ExtensibilityServices
             if (!factories.Any())
             {
                 var path = Path.GetFullPath(new Uri(extensionAssembly.CodeBase).LocalPath);
-                throw new WixException(ErrorMessages.InvalidExtension(path, "The extension does not implement IExtensionFactory. All extensions must have at least one implementation of IExtensionFactory."));
+                throw new WixException(CoreErrors.InvalidExtension(path, "The extension does not implement IExtensionFactory. All extensions must have at least one implementation of IExtensionFactory."));
             }
 
             this.extensionFactories.AddRange(factories);
@@ -86,14 +87,14 @@ namespace WixToolset.Core.ExtensibilityServices
 
                 if (assembly == null)
                 {
-                    throw new WixException(ErrorMessages.CouldNotFindExtensionInPaths(extensionPath, checkedPaths));
+                    throw new WixException(CoreErrors.CouldNotFindExtensionInPaths(extensionPath, checkedPaths));
                 }
 
                 this.Add(assembly);
             }
             catch (ReflectionTypeLoadException rtle)
             {
-                throw new WixException(ErrorMessages.InvalidExtension(checkPath, String.Join(Environment.NewLine, rtle.LoaderExceptions.Select(le => le.ToString()))));
+                throw new WixException(CoreErrors.InvalidExtension(checkPath, String.Join(Environment.NewLine, rtle.LoaderExceptions.Select(le => le.ToString()))));
             }
             catch (WixException)
             {
@@ -101,7 +102,7 @@ namespace WixToolset.Core.ExtensibilityServices
             }
             catch (Exception e)
             {
-                throw new WixException(ErrorMessages.InvalidExtension(checkPath, e.Message), e);
+                throw new WixException(CoreErrors.InvalidExtension(checkPath, e.Message), e);
             }
         }
 
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/FileSystem.cs b/src/wix/WixToolset.Core/ExtensibilityServices/FileSystem.cs
index 8baee3d8..ec314a11 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/FileSystem.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/FileSystem.cs
@@ -7,6 +7,7 @@ namespace WixToolset.Core.ExtensibilityServices
     using System.IO;
     using System.Runtime.InteropServices;
     using System.Threading;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility.Services;
 
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/LayoutServices.cs b/src/wix/WixToolset.Core/ExtensibilityServices/LayoutServices.cs
index 84b43892..9f135beb 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/LayoutServices.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/LayoutServices.cs
@@ -4,6 +4,7 @@ namespace WixToolset.Core.ExtensibilityServices
 {
     using System;
     using System.IO;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility.Data;
     using WixToolset.Extensibility.Services;
@@ -65,7 +66,7 @@ namespace WixToolset.Core.ExtensibilityServices
             }
             catch (PathTooLongException)
             {
-                this.Messaging.Write(ErrorMessages.PathTooLong(sourceLineNumbers, path));
+                this.Messaging.Write(CoreErrors.PathTooLong(sourceLineNumbers, path));
             }
 
             return null;
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
index 52a7cf12..57d19450 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
@@ -6,9 +6,8 @@ namespace WixToolset.Core.ExtensibilityServices
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.Globalization;
-    using System.Linq;
-    using System.Xml;
     using System.Xml.Linq;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Data.WindowsInstaller;
@@ -379,7 +378,7 @@ namespace WixToolset.Core.ExtensibilityServices
                 if (value.StartsWith("PUT-GUID-", StringComparison.OrdinalIgnoreCase) ||
                     value.StartsWith("{PUT-GUID-", StringComparison.OrdinalIgnoreCase))
                 {
-                    this.Messaging.Write(ErrorMessages.ExampleGuid(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                    this.Messaging.Write(CoreErrors.ExampleGuid(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
                 }
                 else
                 {
@@ -522,11 +521,11 @@ namespace WixToolset.Core.ExtensibilityServices
                 }
                 catch (FormatException)
                 {
-                    this.Messaging.Write(ErrorMessages.IllegalLongValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                    this.Messaging.Write(CoreErrors.IllegalLongValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
                 }
                 catch (OverflowException)
                 {
-                    this.Messaging.Write(ErrorMessages.IllegalLongValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                    this.Messaging.Write(CoreErrors.IllegalLongValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
                 }
             }
 
@@ -621,7 +620,7 @@ namespace WixToolset.Core.ExtensibilityServices
                     return YesNoDefaultType.Default;
 
                 default:
-                    this.Messaging.Write(ErrorMessages.IllegalYesNoDefaultValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
+                    this.Messaging.Write(CoreErrors.IllegalYesNoDefaultValue(sourceLineNumbers, attribute.Parent.Name.LocalName, attribute.Name.LocalName, value));
                     return YesNoDefaultType.IllegalValue;
             }
         }
@@ -711,7 +710,7 @@ namespace WixToolset.Core.ExtensibilityServices
             else
             {
                 var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(element);
-                this.Messaging.Write(ErrorMessages.UnhandledExtensionAttribute(sourceLineNumbers, element.Name.LocalName, attribute.Name.LocalName, attribute.Name.NamespaceName));
+                this.Messaging.Write(CoreErrors.UnhandledExtensionAttribute(sourceLineNumbers, element.Name.LocalName, attribute.Name.LocalName, attribute.Name.NamespaceName));
             }
         }
 
@@ -724,7 +723,7 @@ namespace WixToolset.Core.ExtensibilityServices
             else
             {
                 var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(element);
-                this.Messaging.Write(ErrorMessages.UnhandledExtensionElement(childSourceLineNumbers, parentElement.Name.LocalName, element.Name.LocalName, element.Name.NamespaceName));
+                this.Messaging.Write(CoreErrors.UnhandledExtensionElement(childSourceLineNumbers, parentElement.Name.LocalName, element.Name.LocalName, element.Name.NamespaceName));
             }
         }
 
@@ -739,7 +738,7 @@ namespace WixToolset.Core.ExtensibilityServices
             else
             {
                 var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(element);
-                this.Messaging.Write(ErrorMessages.UnhandledExtensionElement(childSourceLineNumbers, parentElement.Name.LocalName, element.Name.LocalName, element.Name.NamespaceName));
+                this.Messaging.Write(CoreErrors.UnhandledExtensionElement(childSourceLineNumbers, parentElement.Name.LocalName, element.Name.LocalName, element.Name.NamespaceName));
             }
 
             return keyPath;
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/PathResolver.cs b/src/wix/WixToolset.Core/ExtensibilityServices/PathResolver.cs
index 72be2bcb..8744cfb2 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/PathResolver.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/PathResolver.cs
@@ -5,6 +5,7 @@ namespace WixToolset.Core.ExtensibilityServices
     using System;
     using System.Collections.Generic;
     using System.IO;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Data.WindowsInstaller;
     using WixToolset.Extensibility.Data;
@@ -16,7 +17,7 @@ namespace WixToolset.Core.ExtensibilityServices
         {
             if (!directories.TryGetValue(directory, out var resolvedDirectory))
             {
-                throw new WixException(ErrorMessages.ExpectedDirectory(directory));
+                throw new WixException(CoreErrors.ExpectedDirectory(directory));
             }
 
             if (null == resolvedDirectory.Path)
@@ -60,7 +61,7 @@ namespace WixToolset.Core.ExtensibilityServices
         {
             if (!directories.TryGetValue(directory, out var resolvedDirectory))
             {
-                throw new WixException(ErrorMessages.ExpectedDirectory(directory));
+                throw new WixException(CoreErrors.ExpectedDirectory(directory));
             }
 
             if (null == resolvedDirectory.Path)
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs b/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
index 50160ebb..3cdd0f43 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs
@@ -7,6 +7,7 @@ namespace WixToolset.Core.ExtensibilityServices
     using System.IO;
     using System.Text;
     using System.Xml.Linq;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
@@ -61,7 +62,7 @@ namespace WixToolset.Core.ExtensibilityServices
             // Check to make sure there are 2 parts and neither is an empty string.
             if (2 != prefixParts.Length || 0 >= prefixParts[0].Length || 0 >= prefixParts[1].Length)
             {
-                throw new WixException(ErrorMessages.InvalidPreprocessorFunction(context.CurrentSourceLineNumber, function));
+                throw new WixException(CoreErrors.InvalidPreprocessorFunction(context.CurrentSourceLineNumber, function));
             }
 
             var prefix = prefixParts[0];
@@ -70,7 +71,7 @@ namespace WixToolset.Core.ExtensibilityServices
             // Check to make sure there are 2 parts, neither is an empty string, and the second part ends with a closing paren.
             if (2 != functionParts.Length || 0 >= functionParts[0].Length || 0 >= functionParts[1].Length || !functionParts[1].EndsWith(")", StringComparison.Ordinal))
             {
-                throw new WixException(ErrorMessages.InvalidPreprocessorFunction(context.CurrentSourceLineNumber, function));
+                throw new WixException(CoreErrors.InvalidPreprocessorFunction(context.CurrentSourceLineNumber, function));
             }
 
             var functionName = functionParts[0];
@@ -118,7 +119,7 @@ namespace WixToolset.Core.ExtensibilityServices
                             // Make sure the base version is specified
                             if (args.Length == 0 || String.IsNullOrEmpty(args[0]))
                             {
-                                throw new WixException(ErrorMessages.InvalidPreprocessorFunctionAutoVersion(context.CurrentSourceLineNumber));
+                                throw new WixException(CoreErrors.InvalidPreprocessorFunctionAutoVersion(context.CurrentSourceLineNumber));
                             }
 
                             // Build = days since 1/1/2000; Revision = seconds since midnight / 2
@@ -142,7 +143,7 @@ namespace WixToolset.Core.ExtensibilityServices
                         }
                         catch (Exception e)
                         {
-                            throw new WixException(ErrorMessages.PreprocessorExtensionEvaluateFunctionFailed(context.CurrentSourceLineNumber, prefix, function, String.Join(",", args), e.Message));
+                            throw new WixException(CoreErrors.PreprocessorExtensionEvaluateFunctionFailed(context.CurrentSourceLineNumber, prefix, function, String.Join(",", args), e.Message));
                         }
                     }
                     else
@@ -170,7 +171,7 @@ namespace WixToolset.Core.ExtensibilityServices
                 }
                 else
                 {
-                    throw new WixException(ErrorMessages.InvalidPreprocessorVariable(context.CurrentSourceLineNumber, variable));
+                    throw new WixException(CoreErrors.InvalidPreprocessorVariable(context.CurrentSourceLineNumber, variable));
                 }
             }
             else
@@ -190,7 +191,7 @@ namespace WixToolset.Core.ExtensibilityServices
                 }
                 else
                 {
-                    throw new WixException(ErrorMessages.InvalidPreprocessorVariable(context.CurrentSourceLineNumber, variable));
+                    throw new WixException(CoreErrors.InvalidPreprocessorVariable(context.CurrentSourceLineNumber, variable));
                 }
             }
         }
@@ -284,7 +285,7 @@ namespace WixToolset.Core.ExtensibilityServices
                         }
                         catch (Exception e)
                         {
-                            throw new WixException(ErrorMessages.PreprocessorExtensionGetVariableValueFailed(context.CurrentSourceLineNumber, prefix, name, e.Message));
+                            throw new WixException(CoreErrors.PreprocessorExtensionGetVariableValueFailed(context.CurrentSourceLineNumber, prefix, name, e.Message));
                         }
                     }
                     else
@@ -301,7 +302,7 @@ namespace WixToolset.Core.ExtensibilityServices
             // Check to make sure there are 2 parts and neither is an empty string.
             if (2 != prefixParts.Length)
             {
-                throw new WixException(ErrorMessages.InvalidPreprocessorPragma(context.CurrentSourceLineNumber, pragmaName));
+                throw new WixException(CoreErrors.InvalidPreprocessorPragma(context.CurrentSourceLineNumber, pragmaName));
             }
 
             var prefix = prefixParts[0];
@@ -309,7 +310,7 @@ namespace WixToolset.Core.ExtensibilityServices
 
             if (String.IsNullOrEmpty(prefix) || String.IsNullOrEmpty(pragma))
             {
-                throw new WixException(ErrorMessages.InvalidPreprocessorPragma(context.CurrentSourceLineNumber, pragmaName));
+                throw new WixException(CoreErrors.InvalidPreprocessorPragma(context.CurrentSourceLineNumber, pragmaName));
             }
 
             switch (prefix)
@@ -363,7 +364,7 @@ namespace WixToolset.Core.ExtensibilityServices
                     currentPosition = remainder.IndexOf(')');
                     if (-1 == currentPosition)
                     {
-                        this.Messaging.Write(ErrorMessages.InvalidPreprocessorVariable(context.CurrentSourceLineNumber, remainder));
+                        this.Messaging.Write(CoreErrors.InvalidPreprocessorVariable(context.CurrentSourceLineNumber, remainder));
                         break;
                     }
 
@@ -417,12 +418,12 @@ namespace WixToolset.Core.ExtensibilityServices
                     {
                         if (isFunction)
                         {
-                            this.Messaging.Write(ErrorMessages.InvalidPreprocessorFunction(context.CurrentSourceLineNumber, remainder));
+                            this.Messaging.Write(CoreErrors.InvalidPreprocessorFunction(context.CurrentSourceLineNumber, remainder));
                             break;
                         }
                         else
                         {
-                            this.Messaging.Write(ErrorMessages.InvalidPreprocessorVariable(context.CurrentSourceLineNumber, remainder));
+                            this.Messaging.Write(CoreErrors.InvalidPreprocessorVariable(context.CurrentSourceLineNumber, remainder));
                             break;
                         }
                     }
@@ -442,12 +443,12 @@ namespace WixToolset.Core.ExtensibilityServices
                     {
                         if (isFunction)
                         {
-                            this.Messaging.Write(ErrorMessages.UndefinedPreprocessorFunction(context.CurrentSourceLineNumber, subString));
+                            this.Messaging.Write(CoreErrors.UndefinedPreprocessorFunction(context.CurrentSourceLineNumber, subString));
                             break;
                         }
                         else
                         {
-                            this.Messaging.Write(ErrorMessages.UndefinedPreprocessorVariable(context.CurrentSourceLineNumber, subString));
+                            this.Messaging.Write(CoreErrors.UndefinedPreprocessorVariable(context.CurrentSourceLineNumber, subString));
                             break;
                         }
                     }
@@ -480,7 +481,7 @@ namespace WixToolset.Core.ExtensibilityServices
         {
             if (!context.Variables.Remove(name))
             {
-                this.Messaging.Write(ErrorMessages.CannotReundefineVariable(context.CurrentSourceLineNumber, name));
+                this.Messaging.Write(CoreErrors.CannotReundefineVariable(context.CurrentSourceLineNumber, name));
             }
         }
 
diff --git a/src/wix/WixToolset.Core/ILibrarian.cs b/src/wix/WixToolset.Core/ILibrarian.cs
index 8f57ca67..b292de61 100644
--- a/src/wix/WixToolset.Core/ILibrarian.cs
+++ b/src/wix/WixToolset.Core/ILibrarian.cs
@@ -2,7 +2,6 @@
 
 namespace WixToolset.Core
 {
-    using WixToolset.Data;
     using WixToolset.Extensibility.Data;
 
     /// <summary>
diff --git a/src/wix/WixToolset.Core/LibraryResult.cs b/src/wix/WixToolset.Core/LibraryResult.cs
index 80db2c3a..3911fdd2 100644
--- a/src/wix/WixToolset.Core/LibraryResult.cs
+++ b/src/wix/WixToolset.Core/LibraryResult.cs
@@ -2,13 +2,9 @@
 
 namespace WixToolset.Core
 {
-    using System;
     using System.Collections.Generic;
-    using System.Threading;
     using WixToolset.Data;
-    using WixToolset.Extensibility;
     using WixToolset.Extensibility.Data;
-    using WixToolset.Extensibility.Services;
 
     internal class LibraryResult : ILibraryResult
     {
diff --git a/src/wix/WixToolset.Core/Link/CollateLocalizationsCommand.cs b/src/wix/WixToolset.Core/Link/CollateLocalizationsCommand.cs
index 20f7e83a..10c89719 100644
--- a/src/wix/WixToolset.Core/Link/CollateLocalizationsCommand.cs
+++ b/src/wix/WixToolset.Core/Link/CollateLocalizationsCommand.cs
@@ -5,6 +5,7 @@ namespace WixToolset.Core.Link
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility.Services;
 
@@ -53,7 +54,7 @@ namespace WixToolset.Core.Link
                 }
                 else if (!newVariable.Overridable)
                 {
-                    this.Messaging.Write(ErrorMessages.DuplicateLocalizationIdentifier(newVariable.SourceLineNumbers, newVariable.Id));
+                    this.Messaging.Write(CoreErrors.DuplicateLocalizationIdentifier(newVariable.SourceLineNumbers, newVariable.Id));
                 }
             }
 
diff --git a/src/wix/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs b/src/wix/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
index ddf446d4..a9f4e027 100644
--- a/src/wix/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
+++ b/src/wix/WixToolset.Core/Link/FindEntrySectionAndLoadSymbolsCommand.cs
@@ -5,6 +5,7 @@ namespace WixToolset.Core.Link
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Extensibility.Services;
 
@@ -77,8 +78,8 @@ namespace WixToolset.Core.Link
                     }
                     else
                     {
-                        this.Messaging.Write(ErrorMessages.MultipleEntrySections(this.EntrySection.Symbols.FirstOrDefault()?.SourceLineNumbers, this.EntrySection.Id, section.Id));
-                        this.Messaging.Write(ErrorMessages.MultipleEntrySections2(section.Symbols.FirstOrDefault()?.SourceLineNumbers));
+                        this.Messaging.Write(CoreErrors.MultipleEntrySections(this.EntrySection.Symbols.FirstOrDefault()?.SourceLineNumbers, this.EntrySection.Id, section.Id));
+                        this.Messaging.Write(CoreErrors.MultipleEntrySections2(section.Symbols.FirstOrDefault()?.SourceLineNumbers));
                     }
                 }
 
diff --git a/src/wix/WixToolset.Core/Link/ResolveReferencesCommand.cs b/src/wix/WixToolset.Core/Link/ResolveReferencesCommand.cs
index 7a3c502a..1ddfdf7c 100644
--- a/src/wix/WixToolset.Core/Link/ResolveReferencesCommand.cs
+++ b/src/wix/WixToolset.Core/Link/ResolveReferencesCommand.cs
@@ -5,6 +5,7 @@ namespace WixToolset.Core.Link
     using System;
     using System.Collections.Generic;
     using System.Linq;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Services;
@@ -90,7 +91,7 @@ namespace WixToolset.Core.Link
                     }
                     else if (accessible.Count == 0)
                     {
-                        this.Messaging.Write(ErrorMessages.UnresolvedReference(reference.SourceLineNumbers, reference.SymbolicName, symbolWithSection.Access));
+                        this.Messaging.Write(CoreErrors.UnresolvedReference(reference.SourceLineNumbers, reference.SymbolicName, symbolWithSection.Access));
                     }
                     else // multiple accessible symbols referenced creates conflicting symbols.
                     {
@@ -117,7 +118,7 @@ namespace WixToolset.Core.Link
                 }
                 else
                 {
-                    this.Messaging.Write(ErrorMessages.UnresolvedReference(reference.SourceLineNumbers, reference.SymbolicName));
+                    this.Messaging.Write(CoreErrors.UnresolvedReference(reference.SourceLineNumbers, reference.SymbolicName));
                 }
             }
         }
diff --git a/src/wix/WixToolset.Core/Link/WixGroupingOrdering.cs b/src/wix/WixToolset.Core/Link/WixGroupingOrdering.cs
index 152f897b..5580ee05 100644
--- a/src/wix/WixToolset.Core/Link/WixGroupingOrdering.cs
+++ b/src/wix/WixToolset.Core/Link/WixGroupingOrdering.cs
@@ -3,16 +3,16 @@
 namespace WixToolset.Core.Link
 {
     using System;
-    using System.Collections.ObjectModel;
     using System.Collections.Generic;
+    using System.Collections.ObjectModel;
     using System.Diagnostics;
     using System.Globalization;
     using System.Linq;
     using System.Text;
+    using WixToolset.Core;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
     using WixToolset.Extensibility.Services;
-    using WixToolset.Data.Burn;
 
     /// <summary>
     /// Grouping and Ordering class of the WiX toolset.
@@ -291,7 +291,7 @@ namespace WixToolset.Core.Link
                 if (this.FindCircularGroupReference(item, item, itemsSeen, out circularReference))
                 {
                     itemsInKnownLoops.Add(itemsSeen);
-                    this.Messaging.Write(ErrorMessages.ReferenceLoopDetected(item.Row.SourceLineNumbers, circularReference));
+                    this.Messaging.Write(CoreErrors.ReferenceLoopDetected(item.Row.SourceLineNumbers, circularReference));
                 }
             }
         }
@@ -581,7 +581,7 @@ namespace WixToolset.Core.Link
                     // have lost some distinction between authored and propagated ordering.
                     string circularReference = String.Format(CultureInfo.InvariantCulture, "{0}:{1} -> {2}:{3} -> {0}:{1}",
                         this.Type, this.Id, after.Type, after.Id);
-                    messageHandler.Write(ErrorMessages.OrderingReferenceLoopDetected(after.Row.SourceLineNumbers, circularReference));
+                    messageHandler.Write(CoreErrors.OrderingReferenceLoopDetected(after.Row.SourceLineNumbers, circularReference));
                     return;
                 }
 
diff --git a/src/wix/WixToolset.Core/Linker.cs b/src/wix/WixToolset.Core/Linker.cs
index d2e09b59..b119e4be 100644
--- a/src/wix/WixToolset.Core/Linker.cs
+++ b/src/wix/WixToolset.Core/Linker.cs
@@ -69,7 +69,7 @@ namespace WixToolset.Core
             var invalidIntermediates = this.Context.Intermediates.Where(i => !i.HasLevel(Data.IntermediateLevels.Compiled));
             if (invalidIntermediates.Any())
             {
-                this.Messaging.Write(ErrorMessages.IntermediatesMustBeCompiled(String.Join(", ", invalidIntermediates.Select(i => i.Id))));
+                this.Messaging.Write(CoreErrors.IntermediatesMustBeCompiled(String.Join(", ", invalidIntermediates.Select(i => i.Id))));
             }
 
             Intermediate intermediate = null;
@@ -123,11 +123,11 @@ namespace WixToolset.Core
                 {
                     if (this.Context.ExpectedOutputType == OutputType.IntermediatePostLink || this.Context.ExpectedOutputType == OutputType.Unknown)
                     {
-                        throw new WixException(ErrorMessages.MissingEntrySection());
+                        throw new WixException(CoreErrors.MissingEntrySection());
                     }
                     else
                     {
-                        throw new WixException(ErrorMessages.MissingEntrySection(this.Context.ExpectedOutputType.ToString()));
+                        throw new WixException(CoreErrors.MissingEntrySection(this.Context.ExpectedOutputType.ToString()));
                     }
                 }
 
@@ -186,7 +186,7 @@ namespace WixToolset.Core
                 {
                     if (!referencedComponents.Contains(component.Id.Id))
                     {
-                        this.Messaging.Write(ErrorMessages.OrphanedComponent(component.SourceLineNumbers, component.Id.Id));
+                        this.Messaging.Write(CoreErrors.OrphanedComponent(component.SourceLineNumbers, component.Id.Id));
                     }
                 }
 
@@ -367,7 +367,7 @@ namespace WixToolset.Core
                 }
                 else if (!symbol.Overridable || (collidingSymbol.Overridable && symbol.Overridable))
                 {
-                    this.Messaging.Write(ErrorMessages.BindVariableCollision(symbol.SourceLineNumbers, id));
+                    this.Messaging.Write(CoreErrors.BindVariableCollision(symbol.SourceLineNumbers, id));
                 }
             }
             else
@@ -411,7 +411,7 @@ namespace WixToolset.Core
                                     {
                                         if (connection.IsExplicitPrimaryFeature)
                                         {
-                                            this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Package"), connection.PrimaryFeature ?? resolvedSection.Id));
+                                            this.Messaging.Write(CoreErrors.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Package"), connection.PrimaryFeature ?? resolvedSection.Id));
                                             continue;
                                         }
                                         else
@@ -442,7 +442,7 @@ namespace WixToolset.Core
                                     connection = featuresToFeatures[wixComplexReferenceRow.Child];
                                     if (null != connection)
                                     {
-                                        this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Package"), connection.PrimaryFeature ?? resolvedSection.Id));
+                                        this.Messaging.Write(CoreErrors.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Package"), connection.PrimaryFeature ?? resolvedSection.Id));
                                         continue;
                                     }
 
@@ -459,7 +459,7 @@ namespace WixToolset.Core
                                     {
                                         if (connection.IsExplicitPrimaryFeature)
                                         {
-                                            this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Package"), connection.PrimaryFeature ?? resolvedSection.Id));
+                                            this.Messaging.Write(CoreErrors.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Package"), connection.PrimaryFeature ?? resolvedSection.Id));
                                             continue;
                                         }
                                         else
@@ -486,7 +486,7 @@ namespace WixToolset.Core
                                 case ComplexReferenceChildType.Component:
                                     if (componentsToModules.ContainsKey(wixComplexReferenceRow.Child))
                                     {
-                                        this.Messaging.Write(ErrorMessages.ComponentReferencedTwice(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.Child));
+                                        this.Messaging.Write(CoreErrors.ComponentReferencedTwice(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.Child));
                                         continue;
                                     }
                                     else
@@ -531,7 +531,7 @@ namespace WixToolset.Core
                                     connection = featuresToFeatures[wixComplexReferenceRow.Child];
                                     if (null != connection)
                                     {
-                                        this.Messaging.Write(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Package"), connection.PrimaryFeature ?? resolvedSection.Id));
+                                        this.Messaging.Write(CoreErrors.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Package"), connection.PrimaryFeature ?? resolvedSection.Id));
                                         continue;
                                     }
 
@@ -721,7 +721,7 @@ namespace WixToolset.Core
                         // way up to present the loop as a directed graph.
                         var loop = String.Join(" -> ", loopDetector);
 
-                        this.Messaging.Write(ErrorMessages.ReferenceLoopDetected(wixComplexReferenceRow?.SourceLineNumbers, loop));
+                        this.Messaging.Write(CoreErrors.ReferenceLoopDetected(wixComplexReferenceRow?.SourceLineNumbers, loop));
 
                         // Cleanup the parentGroupsNeedingProcessing and the loopDetector just like the
                         // exit of this method does at the end because we are exiting early.
@@ -887,11 +887,11 @@ namespace WixToolset.Core
                     // display an error for the component or merge module as appropriate
                     if (null != multipleFeatureComponents)
                     {
-                        this.Messaging.Write(ErrorMessages.ComponentExpectedFeature(symbol.SourceLineNumbers, connectionId, symbol.Definition.Name, symbol.Id.Id));
+                        this.Messaging.Write(CoreErrors.ComponentExpectedFeature(symbol.SourceLineNumbers, connectionId, symbol.Definition.Name, symbol.Id.Id));
                     }
                     else
                     {
-                        this.Messaging.Write(ErrorMessages.MergeModuleExpectedFeature(symbol.SourceLineNumbers, connectionId));
+                        this.Messaging.Write(CoreErrors.MergeModuleExpectedFeature(symbol.SourceLineNumbers, connectionId));
                     }
                 }
                 else
diff --git a/src/wix/WixToolset.Core/LocalizationParser.cs b/src/wix/WixToolset.Core/LocalizationParser.cs
index 29d3d932..45d98636 100644
--- a/src/wix/WixToolset.Core/LocalizationParser.cs
+++ b/src/wix/WixToolset.Core/LocalizationParser.cs
@@ -74,7 +74,7 @@ namespace WixToolset.Core
             }
             else if (!wixVariableRow.Overridable)
             {
-                messaging.Write(ErrorMessages.DuplicateLocalizationIdentifier(wixVariableRow.SourceLineNumbers, wixVariableRow.Id));
+                messaging.Write(CoreErrors.DuplicateLocalizationIdentifier(wixVariableRow.SourceLineNumbers, wixVariableRow.Id));
             }
         }
 
@@ -151,7 +151,7 @@ namespace WixToolset.Core
                 }
                 else
                 {
-                    messaging.Write(ErrorMessages.UnsupportedExtensionElement(sourceLineNumbers, node.Name.ToString(), child.Name.ToString()));
+                    messaging.Write(CoreErrors.UnsupportedExtensionElement(sourceLineNumbers, node.Name.ToString(), child.Name.ToString()));
                 }
             }
 
@@ -196,7 +196,7 @@ namespace WixToolset.Core
                 }
                 else
                 {
-                    messaging.Write(ErrorMessages.UnsupportedExtensionAttribute(sourceLineNumbers, attrib.Parent.Name.ToString(), attrib.Name.ToString()));
+                    messaging.Write(CoreErrors.UnsupportedExtensionAttribute(sourceLineNumbers, attrib.Parent.Name.ToString(), attrib.Name.ToString()));
                 }
             }
 
@@ -325,11 +325,11 @@ namespace WixToolset.Core
                 {
                     if (String.IsNullOrEmpty(localizedControl.Control))
                     {
-                        messaging.Write(ErrorMessages.DuplicatedUiLocalization(sourceLineNumbers, localizedControl.Dialog));
+                        messaging.Write(CoreErrors.DuplicatedUiLocalization(sourceLineNumbers, localizedControl.Dialog));
                     }
                     else
                     {
-                        messaging.Write(ErrorMessages.DuplicatedUiLocalization(sourceLineNumbers, localizedControl.Dialog, localizedControl.Control));
+                        messaging.Write(CoreErrors.DuplicatedUiLocalization(sourceLineNumbers, localizedControl.Dialog, localizedControl.Control));
                     }
                 }
                 else
diff --git a/src/wix/WixToolset.Core/Preprocess/IfState.cs b/src/wix/WixToolset.Core/Preprocess/IfState.cs
index f5bb3e87..b815e1b5 100644
--- a/src/wix/WixToolset.Core/Preprocess/IfState.cs
+++ b/src/wix/WixToolset.Core/Preprocess/IfState.cs
@@ -1,4 +1,4 @@
-// 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.
+// 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.Preprocess
 {
diff --git a/src/wix/WixToolset.Core/Preprocess/PreprocessorOperation.cs b/src/wix/WixToolset.Core/Preprocess/PreprocessorOperation.cs
index 086a0f1a..b631730b 100644
--- a/src/wix/WixToolset.Core/Preprocess/PreprocessorOperation.cs
+++ b/src/wix/WixToolset.Core/Preprocess/PreprocessorOperation.cs
@@ -1,4 +1,4 @@
-// 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.
+// 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.Preprocess
 {
diff --git a/src/wix/WixToolset.Core/Preprocessor.cs b/src/wix/WixToolset.Core/Preprocessor.cs
index fbf70b6a..c403d73b 100644
--- a/src/wix/WixToolset.Core/Preprocessor.cs
+++ b/src/wix/WixToolset.Core/Preprocessor.cs
@@ -344,12 +344,12 @@ namespace WixToolset.Core
                         case "elseif":
                             if (0 == ifStack.Count)
                             {
-                                throw new WixException(ErrorMessages.UnmatchedPreprocessorInstruction(sourceLineNumbers, "if", "elseif"));
+                                throw new WixException(CoreErrors.UnmatchedPreprocessorInstruction(sourceLineNumbers, "if", "elseif"));
                             }
 
                             if (IfState.If != ifContext.IfState && IfState.ElseIf != ifContext.IfState)
                             {
-                                throw new WixException(ErrorMessages.UnmatchedPreprocessorInstruction(sourceLineNumbers, "if", "elseif"));
+                                throw new WixException(CoreErrors.UnmatchedPreprocessorInstruction(sourceLineNumbers, "if", "elseif"));
                             }
 
                             ifContext.IfState = IfState.ElseIf;   // we're now in an elseif
@@ -367,12 +367,12 @@ namespace WixToolset.Core
                         case "else":
                             if (0 == ifStack.Count)
                             {
-                                throw new WixException(ErrorMessages.UnmatchedPreprocessorInstruction(sourceLineNumbers, "if", "else"));
+                                throw new WixException(CoreErrors.UnmatchedPreprocessorInstruction(sourceLineNumbers, "if", "else"));
                             }
 
                             if (IfState.If != ifContext.IfState && IfState.ElseIf != ifContext.IfState)
                             {
-                                throw new WixException(ErrorMessages.UnmatchedPreprocessorInstruction(sourceLineNumbers, "if", "else"));
+                                throw new WixException(CoreErrors.UnmatchedPreprocessorInstruction(sourceLineNumbers, "if", "else"));
                             }
 
                             ifContext.IfState = IfState.Else;   // we're now in an else
@@ -383,7 +383,7 @@ namespace WixToolset.Core
                         case "endif":
                             if (0 == ifStack.Count)
                             {
-                                throw new WixException(ErrorMessages.UnmatchedPreprocessorInstruction(sourceLineNumbers, "if", "endif"));
+                                throw new WixException(CoreErrors.UnmatchedPreprocessorInstruction(sourceLineNumbers, "if", "endif"));
                             }
 
                             ifContext = ifStack.Pop();
@@ -461,7 +461,7 @@ namespace WixToolset.Core
                                 break;
 
                             case "endforeach": // endforeach is handled in PreprocessForeach, so seeing it here is an error
-                                throw new WixException(ErrorMessages.UnmatchedPreprocessorInstruction(sourceLineNumbers, "foreach", "endforeach"));
+                                throw new WixException(CoreErrors.UnmatchedPreprocessorInstruction(sourceLineNumbers, "foreach", "endforeach"));
 
                             case "pragma":
                                 this.PreprocessPragma(state, reader.Value, currentContainer);
@@ -535,13 +535,13 @@ namespace WixToolset.Core
 
             if (0 != ifStack.Count)
             {
-                throw new WixException(ErrorMessages.NonterminatedPreprocessorInstruction(state.Context.CurrentSourceLineNumber, "if", "endif"));
+                throw new WixException(CoreErrors.NonterminatedPreprocessorInstruction(state.Context.CurrentSourceLineNumber, "if", "endif"));
             }
 
             // TODO: can this actually happen?
             if (0 != containerStack.Count)
             {
-                throw new WixException(ErrorMessages.NonterminatedPreprocessorInstruction(state.Context.CurrentSourceLineNumber, "nodes", "nodes"));
+                throw new WixException(CoreErrors.NonterminatedPreprocessorInstruction(state.Context.CurrentSourceLineNumber, "nodes", "nodes"));
             }
         }
 
@@ -555,7 +555,7 @@ namespace WixToolset.Core
             // Resolve other variables in the error message.
             errorMessage = state.Helper.PreprocessString(state.Context, errorMessage);
 
-            throw new WixException(ErrorMessages.PreprocessorError(state.Context.CurrentSourceLineNumber, errorMessage));
+            throw new WixException(CoreErrors.PreprocessorError(state.Context.CurrentSourceLineNumber, errorMessage));
         }
 
         /// <summary>
@@ -582,7 +582,7 @@ namespace WixToolset.Core
 
             if (!match.Success)
             {
-                throw new WixException(ErrorMessages.IllegalDefineStatement(state.Context.CurrentSourceLineNumber, originalDefine));
+                throw new WixException(CoreErrors.IllegalDefineStatement(state.Context.CurrentSourceLineNumber, originalDefine));
             }
 
             var defineName = match.Groups["varName"].Value;
@@ -688,7 +688,7 @@ namespace WixToolset.Core
             var indexOfInToken = reader.Value.IndexOf(" in ", StringComparison.Ordinal);
             if (0 > indexOfInToken)
             {
-                throw new WixException(ErrorMessages.IllegalForeach(state.Context.CurrentSourceLineNumber, reader.Value));
+                throw new WixException(CoreErrors.IllegalForeach(state.Context.CurrentSourceLineNumber, reader.Value));
             }
 
             // parse out the variable name
@@ -699,7 +699,7 @@ namespace WixToolset.Core
             {
                 if (!varValuesString.EndsWith("\"", StringComparison.Ordinal))
                 {
-                    throw new WixException(ErrorMessages.UnmatchedQuotesInExpression(state.Context.CurrentSourceLineNumber, varValuesString));
+                    throw new WixException(CoreErrors.UnmatchedQuotesInExpression(state.Context.CurrentSourceLineNumber, varValuesString));
                 }
 
                 // cut the quotes off the string
@@ -767,7 +767,7 @@ namespace WixToolset.Core
                 }
                 else if (reader.NodeType == XmlNodeType.None)
                 {
-                    throw new WixException(ErrorMessages.ExpectedEndforeach(state.Context.CurrentSourceLineNumber));
+                    throw new WixException(CoreErrors.ExpectedEndforeach(state.Context.CurrentSourceLineNumber));
                 }
 
                 reader.Read();
@@ -811,7 +811,7 @@ namespace WixToolset.Core
 
             if (!match.Success)
             {
-                throw new WixException(ErrorMessages.InvalidPreprocessorPragma(state.Context.CurrentSourceLineNumber, pragmaText));
+                throw new WixException(CoreErrors.InvalidPreprocessorPragma(state.Context.CurrentSourceLineNumber, pragmaText));
             }
 
             // resolve other variables in the pragma argument(s)
@@ -823,7 +823,7 @@ namespace WixToolset.Core
             }
             catch (Exception e)
             {
-                throw new WixException(ErrorMessages.PreprocessorExtensionPragmaFailed(state.Context.CurrentSourceLineNumber, pragmaText, e.Message));
+                throw new WixException(CoreErrors.PreprocessorExtensionPragmaFailed(state.Context.CurrentSourceLineNumber, pragmaText, e.Message));
             }
         }
 
@@ -851,7 +851,7 @@ namespace WixToolset.Core
                 var endingQuotes = expression.IndexOf('\"', 1);
                 if (-1 == endingQuotes)
                 {
-                    throw new WixException(ErrorMessages.UnmatchedQuotesInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
+                    throw new WixException(CoreErrors.UnmatchedQuotesInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
                 }
 
                 // cut the quotes off the string
@@ -885,7 +885,7 @@ namespace WixToolset.Core
 
                 if (-1 == endingParen)
                 {
-                    throw new WixException(ErrorMessages.UnmatchedParenthesisInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
+                    throw new WixException(CoreErrors.UnmatchedParenthesisInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
                 }
                 token = expression.Substring(0, endingParen + 1);
 
@@ -1009,12 +1009,12 @@ namespace WixToolset.Core
             else if (variable.IndexOf("(", StringComparison.Ordinal) != -1 || variable.IndexOf(")", StringComparison.Ordinal) != -1)
             {
                 // make sure it doesn't contain parenthesis
-                throw new WixException(ErrorMessages.UnmatchedParenthesisInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
+                throw new WixException(CoreErrors.UnmatchedParenthesisInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
             }
             else if (variable.IndexOf("\"", StringComparison.Ordinal) != -1)
             {
                 // shouldn't contain quotes
-                throw new WixException(ErrorMessages.UnmatchedQuotesInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
+                throw new WixException(CoreErrors.UnmatchedQuotesInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
             }
 
             return varValue;
@@ -1045,7 +1045,7 @@ namespace WixToolset.Core
             {
                 if (stringLiteral)
                 {
-                    throw new WixException(ErrorMessages.UnmatchedQuotesInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
+                    throw new WixException(CoreErrors.UnmatchedQuotesInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
                 }
 
                 rightValue = this.GetNextToken(state, originalExpression, ref expression, out stringLiteral);
@@ -1093,7 +1093,7 @@ namespace WixToolset.Core
             {
                 if (operation.Length > 0)
                 {
-                    throw new WixException(ErrorMessages.ExpectedVariable(state.Context.CurrentSourceLineNumber, originalExpression));
+                    throw new WixException(CoreErrors.ExpectedVariable(state.Context.CurrentSourceLineNumber, originalExpression));
                 }
 
                 // false expression
@@ -1108,7 +1108,7 @@ namespace WixToolset.Core
                 }
                 else
                 {
-                    throw new WixException(ErrorMessages.UnexpectedLiteral(state.Context.CurrentSourceLineNumber, originalExpression));
+                    throw new WixException(CoreErrors.UnexpectedLiteral(state.Context.CurrentSourceLineNumber, originalExpression));
                 }
             }
             else
@@ -1148,11 +1148,11 @@ namespace WixToolset.Core
                     }
                     catch (FormatException)
                     {
-                        throw new WixException(ErrorMessages.IllegalIntegerInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
+                        throw new WixException(CoreErrors.IllegalIntegerInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
                     }
                     catch (OverflowException)
                     {
-                        throw new WixException(ErrorMessages.IllegalIntegerInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
+                        throw new WixException(CoreErrors.IllegalIntegerInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
                     }
 
                     // Compare the numbers
@@ -1195,7 +1195,7 @@ namespace WixToolset.Core
                 closeParenIndex = expression.IndexOf(')', closeParenIndex);
                 if (closeParenIndex == -1)
                 {
-                    throw new WixException(ErrorMessages.UnmatchedParenthesisInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
+                    throw new WixException(CoreErrors.UnmatchedParenthesisInExpression(state.Context.CurrentSourceLineNumber, originalExpression));
                 }
 
                 if (InsideQuotes(expression, closeParenIndex))
@@ -1245,7 +1245,7 @@ namespace WixToolset.Core
                     currentValue = !currentValue;
                     break;
                 default:
-                    throw new WixException(ErrorMessages.UnexpectedPreprocessorOperator(state.Context.CurrentSourceLineNumber, operation.ToString()));
+                    throw new WixException(CoreErrors.UnexpectedPreprocessorOperator(state.Context.CurrentSourceLineNumber, operation.ToString()));
             }
         }
 
@@ -1296,7 +1296,7 @@ namespace WixToolset.Core
             expression = expression.Trim();
             if (expression.Length == 0)
             {
-                throw new WixException(ErrorMessages.UnexpectedEmptySubexpression(state.Context.CurrentSourceLineNumber, originalExpression));
+                throw new WixException(CoreErrors.UnexpectedEmptySubexpression(state.Context.CurrentSourceLineNumber, originalExpression));
             }
 
             // If the expression starts with parenthesis, evaluate it
@@ -1316,7 +1316,7 @@ namespace WixToolset.Core
                     expression = expression.Substring(3).Trim();
                     if (expression.Length == 0)
                     {
-                        throw new WixException(ErrorMessages.ExpectedExpressionAfterNot(state.Context.CurrentSourceLineNumber, originalExpression));
+                        throw new WixException(CoreErrors.ExpectedExpressionAfterNot(state.Context.CurrentSourceLineNumber, originalExpression));
                     }
 
                     expressionValue = this.EvaluateExpressionRecurse(state, originalExpression, ref expression, PreprocessorOperation.Not, true);
@@ -1345,7 +1345,7 @@ namespace WixToolset.Core
                 }
                 else
                 {
-                    throw new WixException(ErrorMessages.InvalidSubExpression(state.Context.CurrentSourceLineNumber, expression, originalExpression));
+                    throw new WixException(CoreErrors.InvalidSubExpression(state.Context.CurrentSourceLineNumber, expression, originalExpression));
                 }
             }
 
@@ -1380,7 +1380,7 @@ namespace WixToolset.Core
         {
             if (1023 < state.CurrentFileStack.Count)
             {
-                throw new WixException(ErrorMessages.TooDeeplyIncluded(state.Context.CurrentSourceLineNumber, state.CurrentFileStack.Count));
+                throw new WixException(CoreErrors.TooDeeplyIncluded(state.Context.CurrentSourceLineNumber, state.CurrentFileStack.Count));
             }
 
             var path = Path.GetFullPath(fileName);
@@ -1480,7 +1480,7 @@ namespace WixToolset.Core
                         }
                         else
                         {
-                            this.Messaging.Write(ErrorMessages.DuplicateExtensionPreprocessorType(extension.GetType().ToString(), prefix, collidingExtension.GetType().ToString()));
+                            this.Messaging.Write(CoreErrors.DuplicateExtensionPreprocessorType(extension.GetType().ToString(), prefix, collidingExtension.GetType().ToString()));
                         }
                     }
                 }
diff --git a/src/wix/WixToolset.Core/VariableResolution.cs b/src/wix/WixToolset.Core/VariableResolution.cs
index 3b34e294..bea315e4 100644
--- a/src/wix/WixToolset.Core/VariableResolution.cs
+++ b/src/wix/WixToolset.Core/VariableResolution.cs
@@ -26,4 +26,4 @@ namespace WixToolset.Core
         /// </summary>
         public string Value { get; set; }
     }
-}
\ No newline at end of file
+}
diff --git a/src/wix/WixToolset.Core/VariableResolver.cs b/src/wix/WixToolset.Core/VariableResolver.cs
index 987a2290..3498f4a0 100644
--- a/src/wix/WixToolset.Core/VariableResolver.cs
+++ b/src/wix/WixToolset.Core/VariableResolver.cs
@@ -40,7 +40,7 @@ namespace WixToolset.Core
             {
                 if (!TryAddWixVariable(this.locVariables, variable))
                 {
-                    this.Messaging.Write(ErrorMessages.DuplicateLocalizationIdentifier(variable.SourceLineNumbers, variable.Id));
+                    this.Messaging.Write(CoreErrors.DuplicateLocalizationIdentifier(variable.SourceLineNumbers, variable.Id));
                 }
             }
 
@@ -59,7 +59,7 @@ namespace WixToolset.Core
 
             if (!TryAddWixVariable(this.wixVariables, bindVariable))
             {
-                this.Messaging.Write(ErrorMessages.BindVariableCollision(sourceLineNumber, name));
+                this.Messaging.Write(CoreErrors.BindVariableCollision(sourceLineNumber, name));
             }
         }
 
@@ -107,7 +107,7 @@ namespace WixToolset.Core
                     // localization variables do not support inline default values
                     if (variableDefaultValue != null)
                     {
-                        this.Messaging.Write(ErrorMessages.IllegalInlineLocVariable(sourceLineNumbers, variableId, variableDefaultValue));
+                        this.Messaging.Write(CoreErrors.IllegalInlineLocVariable(sourceLineNumbers, variableId, variableDefaultValue));
                         continue;
                     }
 
@@ -159,11 +159,11 @@ namespace WixToolset.Core
                     {
                         if ("loc" == variableNamespace && errorOnUnknown) // unresolved loc variable
                         {
-                            this.Messaging.Write(ErrorMessages.LocalizationVariableUnknown(sourceLineNumbers, variableId));
+                            this.Messaging.Write(CoreErrors.LocalizationVariableUnknown(sourceLineNumbers, variableId));
                         }
                         else if ("wix" == variableNamespace && errorOnUnknown) // unresolved wix variable
                         {
-                            this.Messaging.Write(ErrorMessages.BindVariableUnknown(sourceLineNumbers, variableId));
+                            this.Messaging.Write(CoreErrors.BindVariableUnknown(sourceLineNumbers, variableId));
                         }
 
                         start = parsed.Index + parsed.Length;
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
index e25a69b2..a314aa87 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs
@@ -41,7 +41,7 @@ namespace WixToolsetTest.CoreIntegration
             var linker = serviceProvider.GetService<ILinker>();
             linker.Link(context);
 
-            Assert.Equal((int)ErrorMessages.Ids.IntermediatesMustBeCompiled, messaging.LastErrorNumber);
+            Assert.Equal(395, messaging.LastErrorNumber); // CoreErrors.ValidationFailedToOpenDatabase
             Assert.Single(listener.Messages);
             Assert.EndsWith("TestIntermediate1, TestIntermediate2", listener.Messages[0].ToString());
         }
diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
index ab2729bb..5963ff13 100644
--- a/src/wix/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
+++ b/src/wix/test/WixToolsetTest.CoreIntegration/WixiplFixture.cs
@@ -99,7 +99,7 @@ namespace WixToolsetTest.CoreIntegration
                     "-intermediateFolder", intermediateFolder,
                     "-o", Path.Combine(baseFolder, @"bin\test.msi")
                 });
-                Assert.Equal((int)ErrorMessages.Ids.WixiplSourceFileIsExclusive, result.ExitCode);
+                Assert.Equal(392, result.ExitCode); // CoreErrors.WixiplSourceFileIsExclusive
             }
         }