2 files changed, 311 insertions, 269 deletions

diff --git a/src/WixToolset.Converters/Wix3Converter.cs b/src/WixToolset.Converters/Wix3Converter.cs
index b6366a83..1ae65e4f 100644
--- a/src/WixToolset.Converters/Wix3Converter.cs
+++ b/src/WixToolset.Converters/Wix3Converter.cs
@@ -305,368 +305,376 @@ namespace WixToolset.Converters
             }
         }
 
-    private void ConvertDirectoryElement(XElement element)
-    {
-        if (null == element.Attribute("Name"))
+        private void ConvertDirectoryElement(XElement element)
         {
-            var attribute = element.Attribute("ShortName");
-            if (null != attribute)
+            if (null == element.Attribute("Name"))
             {
-                var shortName = attribute.Value;
-                if (this.OnError(ConverterTestType.AssignDirectoryNameFromShortName, element, "The directory ShortName attribute is being renamed to Name since Name wasn't specified for value '{0}'", shortName))
+                var attribute = element.Attribute("ShortName");
+                if (null != attribute)
                 {
-                    element.Add(new XAttribute("Name", shortName));
-                    attribute.Remove();
+                    var shortName = attribute.Value;
+                    if (this.OnError(ConverterTestType.AssignDirectoryNameFromShortName, element, "The directory ShortName attribute is being renamed to Name since Name wasn't specified for value '{0}'", shortName))
+                    {
+                        element.Add(new XAttribute("Name", shortName));
+                        attribute.Remove();
+                    }
                 }
             }
         }
-    }
 
-    private void ConvertFileElement(XElement element)
-    {
-        if (null == element.Attribute("Id"))
+        private void ConvertFileElement(XElement element)
         {
-            var attribute = element.Attribute("Name");
-
-            if (null == attribute)
+            if (null == element.Attribute("Id"))
             {
-                attribute = element.Attribute("Source");
-            }
+                var attribute = element.Attribute("Name");
 
-            if (null != attribute)
-            {
-                var name = Path.GetFileName(attribute.Value);
+                if (null == attribute)
+                {
+                    attribute = element.Attribute("Source");
+                }
 
-                if (this.OnError(ConverterTestType.AssignAnonymousFileId, element, "The file id is being updated to '{0}' to ensure it remains the same as the default", name))
+                if (null != attribute)
                 {
-                    IEnumerable<XAttribute> attributes = element.Attributes().ToList();
-                    element.RemoveAttributes();
-                    element.Add(new XAttribute("Id", GetIdentifierFromName(name)));
-                    element.Add(attributes);
+                    var name = Path.GetFileName(attribute.Value);
+
+                    if (this.OnError(ConverterTestType.AssignAnonymousFileId, element, "The file id is being updated to '{0}' to ensure it remains the same as the default", name))
+                    {
+                        IEnumerable<XAttribute> attributes = element.Attributes().ToList();
+                        element.RemoveAttributes();
+                        element.Add(new XAttribute("Id", GetIdentifierFromName(name)));
+                        element.Add(attributes);
+                    }
                 }
             }
         }
-    }
-
-    private void ConvertSuppressSignatureValidation(XElement element)
-    {
-        var suppressSignatureValidation = element.Attribute("SuppressSignatureValidation");
 
-        if (null != suppressSignatureValidation)
+        private void ConvertSuppressSignatureValidation(XElement element)
         {
-            if (this.OnError(ConverterTestType.SuppressSignatureValidationDeprecated, element, "The chain package element contains deprecated '{0}' attribute. Use the 'EnableSignatureValidation' attribute instead.", suppressSignatureValidation.Name))
+            var suppressSignatureValidation = element.Attribute("SuppressSignatureValidation");
+
+            if (null != suppressSignatureValidation)
             {
-                if ("no" == suppressSignatureValidation.Value)
+                if (this.OnError(ConverterTestType.SuppressSignatureValidationDeprecated, element, "The chain package element contains deprecated '{0}' attribute. Use the 'EnableSignatureValidation' attribute instead.", suppressSignatureValidation.Name))
                 {
-                    element.Add(new XAttribute("EnableSignatureValidation", "yes"));
+                    if ("no" == suppressSignatureValidation.Value)
+                    {
+                        element.Add(new XAttribute("EnableSignatureValidation", "yes"));
+                    }
                 }
-            }
 
-            suppressSignatureValidation.Remove();
+                suppressSignatureValidation.Remove();
+            }
         }
-    }
-
-    private void ConvertCustomActionElement(XElement xCustomAction)
-    {
-        var xBinaryKey = xCustomAction.Attribute("BinaryKey");
 
-        if (xBinaryKey?.Value == "WixCA")
+        private void ConvertCustomActionElement(XElement xCustomAction)
         {
-            if (this.OnError(ConverterTestType.WixCABinaryIdRenamed, xCustomAction, "The WixCA custom action DLL Binary table id has been renamed. Use the id 'UtilCA' instead."))
+            var xBinaryKey = xCustomAction.Attribute("BinaryKey");
+
+            if (xBinaryKey?.Value == "WixCA" || xBinaryKey?.Value == "UtilCA")
             {
-                xBinaryKey.Value = "UtilCA";
+                if (this.OnError(ConverterTestType.WixCABinaryIdRenamed, xCustomAction, "The WixCA custom action DLL Binary table id has been renamed. Use the id 'Wix4UtilCA_X86' instead."))
+                {
+                    xBinaryKey.Value = "Wix4UtilCA_X86";
+                }
             }
-        }
-
-        var xDllEntry = xCustomAction.Attribute("DllEntry");
 
-        if (xDllEntry?.Value == "CAQuietExec" || xDllEntry?.Value == "CAQuietExec64")
-        {
-            if (this.OnError(ConverterTestType.QuietExecCustomActionsRenamed, xCustomAction, "The CAQuietExec and CAQuietExec64 custom action ids have been renamed. Use the ids 'WixQuietExec' and 'WixQuietExec64' instead."))
+            if (xBinaryKey?.Value == "WixCA_x64" || xBinaryKey?.Value == "UtilCA_x64")
             {
-                xDllEntry.Value = xDllEntry.Value.Replace("CAQuietExec", "WixQuietExec");
+                if (this.OnError(ConverterTestType.WixCABinaryIdRenamed, xCustomAction, "The WixCA_x64 custom action DLL Binary table id has been renamed. Use the id 'Wix4UtilCA_X64' instead."))
+                {
+                    xBinaryKey.Value = "Wix4UtilCA_X64";
+                }
             }
-        }
 
-        var xProperty = xCustomAction.Attribute("Property");
+            var xDllEntry = xCustomAction.Attribute("DllEntry");
 
-        if (xProperty?.Value == "QtExecCmdLine" || xProperty?.Value == "QtExec64CmdLine")
-        {
-            if (this.OnError(ConverterTestType.QuietExecCustomActionsRenamed, xCustomAction, "The QtExecCmdLine and QtExec64CmdLine property ids have been renamed. Use the ids 'WixQuietExecCmdLine' and 'WixQuietExec64CmdLine' instead."))
+            if (xDllEntry?.Value == "CAQuietExec" || xDllEntry?.Value == "CAQuietExec64")
             {
-                xProperty.Value = xProperty.Value.Replace("QtExec", "WixQuietExec");
+                if (this.OnError(ConverterTestType.QuietExecCustomActionsRenamed, xCustomAction, "The CAQuietExec and CAQuietExec64 custom action ids have been renamed. Use the ids 'WixQuietExec' and 'WixQuietExec64' instead."))
+                {
+                    xDllEntry.Value = xDllEntry.Value.Replace("CAQuietExec", "WixQuietExec");
+                }
             }
-        }
-    }
 
-    private void ConvertPropertyElement(XElement xProperty)
-    {
-        var xId = xProperty.Attribute("Id");
+            var xProperty = xCustomAction.Attribute("Property");
 
-        if (xId.Value == "QtExecCmdTimeout")
-        {
-            this.OnError(ConverterTestType.QtExecCmdTimeoutAmbiguous, xProperty, "QtExecCmdTimeout was previously used for both CAQuietExec and CAQuietExec64. For WixQuietExec, use WixQuietExecCmdTimeout. For WixQuietExec64, use WixQuietExec64CmdTimeout.");
+            if (xProperty?.Value == "QtExecCmdLine" || xProperty?.Value == "QtExec64CmdLine")
+            {
+                if (this.OnError(ConverterTestType.QuietExecCustomActionsRenamed, xCustomAction, "The QtExecCmdLine and QtExec64CmdLine property ids have been renamed. Use the ids 'WixQuietExecCmdLine' and 'WixQuietExec64CmdLine' instead."))
+                {
+                    xProperty.Value = xProperty.Value.Replace("QtExec", "WixQuietExec");
+                }
+            }
         }
-    }
 
-    /// <summary>
-    /// Converts a Wix element.
-    /// </summary>
-    /// <param name="element">The Wix element to convert.</param>
-    /// <returns>The converted element.</returns>
-    private void ConvertElementWithoutNamespace(XElement element)
-    {
-        if (this.OnError(ConverterTestType.XmlnsMissing, element, "The xmlns attribute is missing.  It must be present with a value of '{0}'.", WixNamespace.NamespaceName))
+        private void ConvertPropertyElement(XElement xProperty)
         {
-            element.Name = WixNamespace.GetName(element.Name.LocalName);
-
-            element.Add(new XAttribute("xmlns", WixNamespace.NamespaceName)); // set the default namespace.
+            var xId = xProperty.Attribute("Id");
 
-            foreach (var elementWithoutNamespace in element.DescendantsAndSelf().Where(e => XNamespace.None == e.Name.Namespace))
+            if (xId.Value == "QtExecCmdTimeout")
             {
-                elementWithoutNamespace.Name = WixNamespace.GetName(elementWithoutNamespace.Name.LocalName);
+                this.OnError(ConverterTestType.QtExecCmdTimeoutAmbiguous, xProperty, "QtExecCmdTimeout was previously used for both CAQuietExec and CAQuietExec64. For WixQuietExec, use WixQuietExecCmdTimeout. For WixQuietExec64, use WixQuietExec64CmdTimeout.");
             }
         }
-    }
 
-    private IEnumerable<ConverterTestType> YieldConverterTypes(IEnumerable<string> types)
-    {
-        if (null != types)
+        /// <summary>
+        /// Converts a Wix element.
+        /// </summary>
+        /// <param name="element">The Wix element to convert.</param>
+        /// <returns>The converted element.</returns>
+        private void ConvertElementWithoutNamespace(XElement element)
         {
-            foreach (var type in types)
+            if (this.OnError(ConverterTestType.XmlnsMissing, element, "The xmlns attribute is missing.  It must be present with a value of '{0}'.", WixNamespace.NamespaceName))
             {
+                element.Name = WixNamespace.GetName(element.Name.LocalName);
 
-                if (Enum.TryParse<ConverterTestType>(type, true, out var itt))
-                {
-                    yield return itt;
-                }
-                else // not a known ConverterTestType
+                element.Add(new XAttribute("xmlns", WixNamespace.NamespaceName)); // set the default namespace.
+
+                foreach (var elementWithoutNamespace in element.DescendantsAndSelf().Where(e => XNamespace.None == e.Name.Namespace))
                 {
-                    this.OnError(ConverterTestType.ConverterTestTypeUnknown, null, "Unknown error type: '{0}'.", type);
+                    elementWithoutNamespace.Name = WixNamespace.GetName(elementWithoutNamespace.Name.LocalName);
                 }
             }
         }
-    }
 
-    private static void UpdateElementsWithDeprecatedNamespaces(IEnumerable<XElement> elements, Dictionary<XNamespace, XNamespace> deprecatedToUpdatedNamespaces)
-    {
-        foreach (var element in elements)
+        private IEnumerable<ConverterTestType> YieldConverterTypes(IEnumerable<string> types)
         {
-
-            if (deprecatedToUpdatedNamespaces.TryGetValue(element.Name.Namespace, out var ns))
-            {
-                element.Name = ns.GetName(element.Name.LocalName);
-            }
-
-            // Remove all the attributes and add them back to with their namespace updated (as necessary).
-            IEnumerable<XAttribute> attributes = element.Attributes().ToList();
-            element.RemoveAttributes();
-
-            foreach (var attribute in attributes)
+            if (null != types)
             {
-                var convertedAttribute = attribute;
-
-                if (attribute.IsNamespaceDeclaration)
+                foreach (var type in types)
                 {
-                    if (deprecatedToUpdatedNamespaces.TryGetValue(attribute.Value, out ns))
+
+                    if (Enum.TryParse<ConverterTestType>(type, true, out var itt))
                     {
-                        convertedAttribute = ("xmlns" == attribute.Name.LocalName) ? new XAttribute(attribute.Name.LocalName, ns.NamespaceName) : new XAttribute(XNamespace.Xmlns + attribute.Name.LocalName, ns.NamespaceName);
+                        yield return itt;
+                    }
+                    else // not a known ConverterTestType
+                    {
+                        this.OnError(ConverterTestType.ConverterTestTypeUnknown, null, "Unknown error type: '{0}'.", type);
                     }
                 }
-                else if (deprecatedToUpdatedNamespaces.TryGetValue(attribute.Name.Namespace, out ns))
-                {
-                    convertedAttribute = new XAttribute(ns.GetName(attribute.Name.LocalName), attribute.Value);
-                }
-
-                element.Add(convertedAttribute);
             }
         }
-    }
 
-    /// <summary>
-    /// Determine if the whitespace preceding a node is appropriate for its depth level.
-    /// </summary>
-    /// <param name="indentationAmount">Indentation value to use when validating leading whitespace.</param>
-    /// <param name="level">The depth level that should match this whitespace.</param>
-    /// <param name="whitespace">The whitespace to validate.</param>
-    /// <returns>true if the whitespace is legal; false otherwise.</returns>
-    private static bool LeadingWhitespaceValid(int indentationAmount, int level, string whitespace)
-    {
-        // Strip off leading newlines; there can be an arbitrary number of these.
-        whitespace = whitespace.TrimStart(XDocumentNewLine);
-
-        var indentation = new string(' ', level * indentationAmount);
-
-        return whitespace == indentation;
-    }
-
-    /// <summary>
-    /// Fix the whitespace in a whitespace node.
-    /// </summary>
-    /// <param name="indentationAmount">Indentation value to use when validating leading whitespace.</param>
-    /// <param name="level">The depth level of the desired whitespace.</param>
-    /// <param name="whitespace">The whitespace node to fix.</param>
-    private static void FixupWhitespace(int indentationAmount, int level, XText whitespace)
-    {
-        var value = new StringBuilder(whitespace.Value.Length);
-
-        // Keep any previous preceeding new lines.
-        var newlines = whitespace.Value.TakeWhile(c => c == XDocumentNewLine).Count();
-
-        // Ensure there is always at least one new line before the indentation.
-        value.Append(XDocumentNewLine, newlines == 0 ? 1 : newlines);
-
-        whitespace.Value = value.Append(' ', level * indentationAmount).ToString();
-    }
-
-    /// <summary>
-    /// Output an error message to the console.
-    /// </summary>
-    /// <param name="converterTestType">The type of converter test.</param>
-    /// <param name="node">The node that caused the error.</param>
-    /// <param name="message">Detailed error message.</param>
-    /// <param name="args">Additional formatted string arguments.</param>
-    /// <returns>Returns true indicating that action should be taken on this error, and false if it should be ignored.</returns>
-    private bool OnError(ConverterTestType converterTestType, XObject node, string message, params object[] args)
-    {
-        if (this.IgnoreErrors.Contains(converterTestType)) // ignore the error
+        private static void UpdateElementsWithDeprecatedNamespaces(IEnumerable<XElement> elements, Dictionary<XNamespace, XNamespace> deprecatedToUpdatedNamespaces)
         {
-            return false;
-        }
-
-        // Increase the error count.
-        this.Errors++;
-
-        var sourceLine = (null == node) ? new SourceLineNumber(this.SourceFile ?? "wixcop.exe") : new SourceLineNumber(this.SourceFile, ((IXmlLineInfo)node).LineNumber);
-        var warning = this.ErrorsAsWarnings.Contains(converterTestType);
-        var display = String.Format(CultureInfo.CurrentCulture, message, args);
+            foreach (var element in elements)
+            {
 
-        var msg = new Message(sourceLine, warning ? MessageLevel.Warning : MessageLevel.Error, (int)converterTestType, "{0} ({1})", display, converterTestType.ToString());
+                if (deprecatedToUpdatedNamespaces.TryGetValue(element.Name.Namespace, out var ns))
+                {
+                    element.Name = ns.GetName(element.Name.LocalName);
+                }
 
-        this.Messaging.Write(msg);
+                // Remove all the attributes and add them back to with their namespace updated (as necessary).
+                IEnumerable<XAttribute> attributes = element.Attributes().ToList();
+                element.RemoveAttributes();
 
-        return true;
-    }
+                foreach (var attribute in attributes)
+                {
+                    var convertedAttribute = attribute;
 
-    /// <summary>
-    /// Return an identifier based on passed file/directory name
-    /// </summary>
-    /// <param name="name">File/directory name to generate identifer from</param>
-    /// <returns>A version of the name that is a legal identifier.</returns>
-    /// <remarks>This is duplicated from WiX's Common class.</remarks>
-    private static string GetIdentifierFromName(string name)
-    {
-        string result = IllegalIdentifierCharacters.Replace(name, "_"); // replace illegal characters with "_".
+                    if (attribute.IsNamespaceDeclaration)
+                    {
+                        if (deprecatedToUpdatedNamespaces.TryGetValue(attribute.Value, out ns))
+                        {
+                            convertedAttribute = ("xmlns" == attribute.Name.LocalName) ? new XAttribute(attribute.Name.LocalName, ns.NamespaceName) : new XAttribute(XNamespace.Xmlns + attribute.Name.LocalName, ns.NamespaceName);
+                        }
+                    }
+                    else if (deprecatedToUpdatedNamespaces.TryGetValue(attribute.Name.Namespace, out ns))
+                    {
+                        convertedAttribute = new XAttribute(ns.GetName(attribute.Name.LocalName), attribute.Value);
+                    }
 
-        // MSI identifiers must begin with an alphabetic character or an
-        // underscore. Prefix all other values with an underscore.
-        if (AddPrefix.IsMatch(name))
-        {
-            result = String.Concat("_", result);
+                    element.Add(convertedAttribute);
+                }
+            }
         }
 
-        return result;
-    }
-
-    /// <summary>
-    /// Converter test types.  These are used to condition error messages down to warnings.
-    /// </summary>
-    private enum ConverterTestType
-    {
-        /// <summary>
-        /// Internal-only: displayed when a string cannot be converted to an ConverterTestType.
-        /// </summary>
-        ConverterTestTypeUnknown,
-
         /// <summary>
-        /// Displayed when an XML loading exception has occurred.
+        /// Determine if the whitespace preceding a node is appropriate for its depth level.
         /// </summary>
-        XmlException,
-
-        /// <summary>
-        /// Displayed when a file cannot be accessed; typically when trying to save back a fixed file.
-        /// </summary>
-        UnauthorizedAccessException,
+        /// <param name="indentationAmount">Indentation value to use when validating leading whitespace.</param>
+        /// <param name="level">The depth level that should match this whitespace.</param>
+        /// <param name="whitespace">The whitespace to validate.</param>
+        /// <returns>true if the whitespace is legal; false otherwise.</returns>
+        private static bool LeadingWhitespaceValid(int indentationAmount, int level, string whitespace)
+        {
+            // Strip off leading newlines; there can be an arbitrary number of these.
+            whitespace = whitespace.TrimStart(XDocumentNewLine);
 
-        /// <summary>
-        /// Displayed when the encoding attribute in the XML declaration is not 'UTF-8'.
-        /// </summary>
-        DeclarationEncodingWrong,
+            var indentation = new string(' ', level * indentationAmount);
 
-        /// <summary>
-        /// Displayed when the XML declaration is missing from the source file.
-        /// </summary>
-        DeclarationMissing,
+            return whitespace == indentation;
+        }
 
         /// <summary>
-        /// Displayed when the whitespace preceding a CDATA node is wrong.
+        /// Fix the whitespace in a whitespace node.
         /// </summary>
-        WhitespacePrecedingCDATAWrong,
+        /// <param name="indentationAmount">Indentation value to use when validating leading whitespace.</param>
+        /// <param name="level">The depth level of the desired whitespace.</param>
+        /// <param name="whitespace">The whitespace node to fix.</param>
+        private static void FixupWhitespace(int indentationAmount, int level, XText whitespace)
+        {
+            var value = new StringBuilder(whitespace.Value.Length);
 
-        /// <summary>
-        /// Displayed when the whitespace preceding a node is wrong.
-        /// </summary>
-        WhitespacePrecedingNodeWrong,
+            // Keep any previous preceeding new lines.
+            var newlines = whitespace.Value.TakeWhile(c => c == XDocumentNewLine).Count();
 
-        /// <summary>
-        /// Displayed when an element is not empty as it should be.
-        /// </summary>
-        NotEmptyElement,
+            // Ensure there is always at least one new line before the indentation.
+            value.Append(XDocumentNewLine, newlines == 0 ? 1 : newlines);
 
-        /// <summary>
-        /// Displayed when the whitespace following a CDATA node is wrong.
-        /// </summary>
-        WhitespaceFollowingCDATAWrong,
+            whitespace.Value = value.Append(' ', level * indentationAmount).ToString();
+        }
 
         /// <summary>
-        /// Displayed when the whitespace preceding an end element is wrong.
+        /// Output an error message to the console.
         /// </summary>
-        WhitespacePrecedingEndElementWrong,
+        /// <param name="converterTestType">The type of converter test.</param>
+        /// <param name="node">The node that caused the error.</param>
+        /// <param name="message">Detailed error message.</param>
+        /// <param name="args">Additional formatted string arguments.</param>
+        /// <returns>Returns true indicating that action should be taken on this error, and false if it should be ignored.</returns>
+        private bool OnError(ConverterTestType converterTestType, XObject node, string message, params object[] args)
+        {
+            if (this.IgnoreErrors.Contains(converterTestType)) // ignore the error
+            {
+                return false;
+            }
 
-        /// <summary>
-        /// Displayed when the xmlns attribute is missing from the document element.
-        /// </summary>
-        XmlnsMissing,
+            // Increase the error count.
+            this.Errors++;
 
-        /// <summary>
-        /// Displayed when the xmlns attribute on the document element is wrong.
-        /// </summary>
-        XmlnsValueWrong,
+            var sourceLine = (null == node) ? new SourceLineNumber(this.SourceFile ?? "wixcop.exe") : new SourceLineNumber(this.SourceFile, ((IXmlLineInfo)node).LineNumber);
+            var warning = this.ErrorsAsWarnings.Contains(converterTestType);
+            var display = String.Format(CultureInfo.CurrentCulture, message, args);
 
-        /// <summary>
-        /// Assign an identifier to a File element when on Id attribute is specified.
-        /// </summary>
-        AssignAnonymousFileId,
+            var msg = new Message(sourceLine, warning ? MessageLevel.Warning : MessageLevel.Error, (int)converterTestType, "{0} ({1})", display, converterTestType.ToString());
 
-        /// <summary>
-        /// SuppressSignatureValidation attribute is deprecated and replaced with EnableSignatureValidation.
-        /// </summary>
-        SuppressSignatureValidationDeprecated,
+            this.Messaging.Write(msg);
 
-        /// <summary>
-        /// WixCA Binary/@Id has been renamed to UtilCA.
-        /// </summary>
-        WixCABinaryIdRenamed,
+            return true;
+        }
 
         /// <summary>
-        /// QtExec custom actions have been renamed.
+        /// Return an identifier based on passed file/directory name
         /// </summary>
-        QuietExecCustomActionsRenamed,
+        /// <param name="name">File/directory name to generate identifer from</param>
+        /// <returns>A version of the name that is a legal identifier.</returns>
+        /// <remarks>This is duplicated from WiX's Common class.</remarks>
+        private static string GetIdentifierFromName(string name)
+        {
+            string result = IllegalIdentifierCharacters.Replace(name, "_"); // replace illegal characters with "_".
 
-        /// <summary>
-        /// QtExecCmdTimeout was previously used for both CAQuietExec and CAQuietExec64. For WixQuietExec, use WixQuietExecCmdTimeout. For WixQuietExec64, use WixQuietExec64CmdTimeout.
-        /// </summary>
-        QtExecCmdTimeoutAmbiguous,
+            // MSI identifiers must begin with an alphabetic character or an
+            // underscore. Prefix all other values with an underscore.
+            if (AddPrefix.IsMatch(name))
+            {
+                result = String.Concat("_", result);
+            }
 
-        /// <summary>
-        /// Directory/@ShortName may only be specified with Directory/@Name.
-        /// </summary>
-        AssignDirectoryNameFromShortName,
+            return result;
+        }
 
         /// <summary>
-        /// BootstrapperApplicationData attribute is deprecated and replaced with Unreal.
+        /// Converter test types.  These are used to condition error messages down to warnings.
         /// </summary>
-        BootstrapperApplicationDataDeprecated,
+        private enum ConverterTestType
+        {
+            /// <summary>
+            /// Internal-only: displayed when a string cannot be converted to an ConverterTestType.
+            /// </summary>
+            ConverterTestTypeUnknown,
+
+            /// <summary>
+            /// Displayed when an XML loading exception has occurred.
+            /// </summary>
+            XmlException,
+
+            /// <summary>
+            /// Displayed when a file cannot be accessed; typically when trying to save back a fixed file.
+            /// </summary>
+            UnauthorizedAccessException,
+
+            /// <summary>
+            /// Displayed when the encoding attribute in the XML declaration is not 'UTF-8'.
+            /// </summary>
+            DeclarationEncodingWrong,
+
+            /// <summary>
+            /// Displayed when the XML declaration is missing from the source file.
+            /// </summary>
+            DeclarationMissing,
+
+            /// <summary>
+            /// Displayed when the whitespace preceding a CDATA node is wrong.
+            /// </summary>
+            WhitespacePrecedingCDATAWrong,
+
+            /// <summary>
+            /// Displayed when the whitespace preceding a node is wrong.
+            /// </summary>
+            WhitespacePrecedingNodeWrong,
+
+            /// <summary>
+            /// Displayed when an element is not empty as it should be.
+            /// </summary>
+            NotEmptyElement,
+
+            /// <summary>
+            /// Displayed when the whitespace following a CDATA node is wrong.
+            /// </summary>
+            WhitespaceFollowingCDATAWrong,
+
+            /// <summary>
+            /// Displayed when the whitespace preceding an end element is wrong.
+            /// </summary>
+            WhitespacePrecedingEndElementWrong,
+
+            /// <summary>
+            /// Displayed when the xmlns attribute is missing from the document element.
+            /// </summary>
+            XmlnsMissing,
+
+            /// <summary>
+            /// Displayed when the xmlns attribute on the document element is wrong.
+            /// </summary>
+            XmlnsValueWrong,
+
+            /// <summary>
+            /// Assign an identifier to a File element when on Id attribute is specified.
+            /// </summary>
+            AssignAnonymousFileId,
+
+            /// <summary>
+            /// SuppressSignatureValidation attribute is deprecated and replaced with EnableSignatureValidation.
+            /// </summary>
+            SuppressSignatureValidationDeprecated,
+
+            /// <summary>
+            /// WixCA Binary/@Id has been renamed to UtilCA.
+            /// </summary>
+            WixCABinaryIdRenamed,
+
+            /// <summary>
+            /// QtExec custom actions have been renamed.
+            /// </summary>
+            QuietExecCustomActionsRenamed,
+
+            /// <summary>
+            /// QtExecCmdTimeout was previously used for both CAQuietExec and CAQuietExec64. For WixQuietExec, use WixQuietExecCmdTimeout. For WixQuietExec64, use WixQuietExec64CmdTimeout.
+            /// </summary>
+            QtExecCmdTimeoutAmbiguous,
+
+            /// <summary>
+            /// Directory/@ShortName may only be specified with Directory/@Name.
+            /// </summary>
+            AssignDirectoryNameFromShortName,
+
+            /// <summary>
+            /// BootstrapperApplicationData attribute is deprecated and replaced with Unreal.
+            /// </summary>
+            BootstrapperApplicationDataDeprecated,
+        }
     }
 }
-}
diff --git a/src/test/WixToolsetTest.Converters/ConverterFixture.cs b/src/test/WixToolsetTest.Converters/ConverterFixture.cs
index cb70b35a..c6037787 100644
--- a/src/test/WixToolsetTest.Converters/ConverterFixture.cs
+++ b/src/test/WixToolsetTest.Converters/ConverterFixture.cs
@@ -590,6 +590,40 @@ namespace WixToolsetTest.Converters
             Assert.Equal(expected, actual);
         }
 
+        [Fact]
+        public void CanConvertCustomAction()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version='1.0' encoding='utf-8'?>",
+                "<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>",
+                "  <CustomAction Id='Foo' BinaryKey='WixCA' DllEntry='CAQuietExec' />",
+                "  <CustomAction Id='Foo' BinaryKey='WixCA_x64' DllEntry='CAQuietExec64' />",
+                "  <CustomAction Id='Foo' BinaryKey='UtilCA' DllEntry='WixQuietExec' />",
+                "  <CustomAction Id='Foo' BinaryKey='UtilCA_x64' DllEntry='WixQuietExec64' />",
+                "</Wix>");
+
+            var expected = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <CustomAction Id=\"Foo\" BinaryKey=\"Wix4UtilCA_X86\" DllEntry=\"WixQuietExec\" />",
+                "  <CustomAction Id=\"Foo\" BinaryKey=\"Wix4UtilCA_X64\" DllEntry=\"WixQuietExec64\" />",
+                "  <CustomAction Id=\"Foo\" BinaryKey=\"Wix4UtilCA_X86\" DllEntry=\"WixQuietExec\" />",
+                "  <CustomAction Id=\"Foo\" BinaryKey=\"Wix4UtilCA_X64\" DllEntry=\"WixQuietExec64\" />",
+                "</Wix>");
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new DummyMessaging();
+            var converter = new Wix3Converter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+
+            var actual = UnformattedDocumentString(document);
+
+            Assert.Equal(6, errors);
+            Assert.Equal(expected, actual);
+        }
+
         private static string UnformattedDocumentString(XDocument document)
         {
             var sb = new StringBuilder();