Resolve issues with inner text

Fixes wixtoolset/issues#7739

2 files changed, 625 insertions, 98 deletions

diff --git a/src/wix/WixToolset.Converters/WixConverter.cs b/src/wix/WixToolset.Converters/WixConverter.cs
index 178b90be..3fea4498 100644
--- a/src/wix/WixToolset.Converters/WixConverter.cs
+++ b/src/wix/WixToolset.Converters/WixConverter.cs
@@ -1033,17 +1033,18 @@ namespace WixToolset.Converters
             using (var lab = new ConversionLab(element))
             {
                 var xConditions = element.Elements(ConditionElementName).ToList();
-                var comments = new List<XNode>();
+                var collector = new InnerContentCollector();
                 var conditions = new List<KeyValuePair<string, string>>();
 
                 foreach (var xCondition in xConditions)
                 {
                     var action = UppercaseFirstChar(xCondition.Attribute("Action")?.Value);
+                   
                     if (!String.IsNullOrEmpty(action) &&
-                        TryGetInnerText(xCondition, out var text, out comments, comments) &&
+                        collector.CollectInnerTextAndCommentsForAttributeValue(xCondition, out string value) &&
                         this.OnInformation(ConverterTestType.InnerTextDeprecated, element, "Using {0} element text is deprecated. Use the '{1}Condition' attribute instead.", xCondition.Name.LocalName, action))
                     {
-                        conditions.Add(new KeyValuePair<string, string>(action, text));
+                        conditions.Add(new KeyValuePair<string, string>(action, value));
                     }
                 }
 
@@ -1062,7 +1063,7 @@ namespace WixToolset.Converters
                 }
 
                 lab.RemoveOrphanTextNodes();
-                lab.AddCommentsAsSiblings(comments);
+                lab.AddCommentsAsSiblings(collector.Comments);
             }
         }
 
@@ -1080,15 +1081,17 @@ namespace WixToolset.Converters
             var xCondition = element.Element(ConditionElementName);
             if (xCondition != null)
             {
-                if (TryGetInnerText(xCondition, out var text, out var comments) &&
+                var collector = new InnerContentCollector();
+
+                if (collector.CollectInnerTextAndCommentsForAttributeValue(xCondition, out string value) &&
                     this.OnInformation(ConverterTestType.InnerTextDeprecated, element, "Using {0} element text is deprecated. Use the 'Condition' attribute instead.", xCondition.Name.LocalName))
                 {
                     using (var lab = new ConversionLab(element))
                     {
                         xCondition.Remove();
-                        element.Add(new XAttribute("Condition", text));
+                        element.Add(new XAttribute("Condition", value));
                         lab.RemoveOrphanTextNodes();
-                        lab.AddCommentsAsSiblings(comments);
+                        lab.AddCommentsAsSiblings(collector.Comments);
                     }
                 }
             }
@@ -1191,16 +1194,18 @@ namespace WixToolset.Converters
             if (xCondition != null)
             {
                 var level = xCondition.Attribute("Level")?.Value;
+                var collector = new InnerContentCollector();
+
                 if (!String.IsNullOrEmpty(level) &&
-                    TryGetInnerText(xCondition, out var text, out var comments) &&
+                    collector.CollectInnerTextAndCommentsForAttributeValue(xCondition, out string value) &&
                     this.OnInformation(ConverterTestType.InnerTextDeprecated, element, "Using {0} element text is deprecated. Use the 'Level' element instead.", xCondition.Name.LocalName))
                 {
                     using (var lab = new ConversionLab(xCondition))
                     {
                         lab.ReplaceTargetElement(new XElement(LevelElementName,
                                                               new XAttribute("Value", level),
-                                                              new XAttribute("Condition", text)));
-                        lab.AddCommentsAsSiblings(comments);
+                                                              new XAttribute("Condition", value)));
+                        lab.AddCommentsAsSiblings(collector.Comments);
                     }
                 }
             }
@@ -1235,17 +1240,23 @@ namespace WixToolset.Converters
         private void ConvertLaunchConditionElement(XElement element)
         {
             var message = element.Attribute("Message")?.Value;
+            var collector = new InnerContentCollector();
 
             if (!String.IsNullOrEmpty(message) &&
-                TryGetInnerText(element, out var text, out var comments) &&
+                collector.CollectInnerTextWithTrailingWhitespaceAndCommentsForAttributeValue(element, out string value) &&
                 this.OnInformation(ConverterTestType.InnerTextDeprecated, element, "Using {0} element text is deprecated. Use the 'Launch' element instead.", element.Name.LocalName))
             {
+                if (String.IsNullOrWhiteSpace(value))
+                {
+                    value = String.Empty;
+                }
+
                 using (var lab = new ConversionLab(element))
                 {
                     lab.ReplaceTargetElement(new XElement(LaunchElementName,
-                                                          new XAttribute("Condition", text),
+                                                          new XAttribute("Condition", value),
                                                           new XAttribute("Message", message)));
-                    lab.AddCommentsAsSiblings(comments);
+                    lab.AddCommentsAsSiblings(collector.Comments);
                 }
             }
         }
@@ -1290,7 +1301,8 @@ namespace WixToolset.Converters
             var xCondition = element.Element(ConditionElementName);
             if (xCondition != null)
             {
-                if (TryGetInnerText(xCondition, out var text, out var comments) &&
+                var collector = new InnerContentCollector();
+                if (collector.CollectInnerTextAndCommentsForAttributeValue(xCondition, out string value) &&
                     this.OnInformation(ConverterTestType.InnerTextDeprecated, element, "Using {0} element text is deprecated. Use the 'Condition' attribute instead.", xCondition.Name.LocalName))
                 {
                     using (var lab = new ConversionLab(xCondition))
@@ -1299,9 +1311,9 @@ namespace WixToolset.Converters
                     }
                     using (var lab = new ConversionLab(element))
                     {
-                        element.Add(new XAttribute("Condition", text));
+                        element.Add(new XAttribute("Condition", value));
                         lab.RemoveOrphanTextNodes();
-                        lab.AddCommentsAsSiblings(comments);
+                        lab.AddCommentsAsSiblings(collector.Comments);
                     }
                 }
             }
@@ -1669,33 +1681,35 @@ namespace WixToolset.Converters
 
         private void ConvertPublishElement(XElement element)
         {
-            if (TryGetInnerText(element, out var text, out var comments) &&
+            var collector = new InnerContentCollector();
+
+            if (collector.CollectInnerTextAndCommentsForAttributeValue(element, out string value) &&
                 this.OnInformation(ConverterTestType.InnerTextDeprecated, element, "Using {0} element text is deprecated. Use the 'Condition' attribute instead.", element.Name.LocalName))
             {
                 using (var lab = new ConversionLab(element))
                 {
-                    if ("1" == text)
+                    if ("1" == value)
                     {
                         this.OnInformation(ConverterTestType.PublishConditionOneUnnecessary, element, "Adding Condition='1' on {0} elements is no longer necessary. Remove the Condition attribute.", element.Name.LocalName);
                     }
                     else
                     {
-                        element.Add(new XAttribute("Condition", text));
+                        element.Add(new XAttribute("Condition", value));
                     }
 
                     lab.RemoveOrphanTextNodes();
-                    lab.AddCommentsAsSiblings(comments);
+                    lab.AddCommentsAsSiblings(collector.Comments);
                 }
             }
 
-            var evnt = element.Attribute("Event")?.Value;
-            var value = element.Attribute("Value")?.Value;
+            var eventName = element.Attribute("Event")?.Value;
+            var eventValue = element.Attribute("Value")?.Value;
 
-            if (evnt?.Equals("DoAction", StringComparison.OrdinalIgnoreCase) == true
-                && value?.StartsWith("WixUI", StringComparison.OrdinalIgnoreCase) == true
+            if (eventName?.Equals("DoAction", StringComparison.OrdinalIgnoreCase) == true
+                && eventValue?.StartsWith("WixUI", StringComparison.OrdinalIgnoreCase) == true
                 && this.OnInformation(ConverterTestType.CustomActionIdsIncludePlatformSuffix, element, "Custom action ids have changed in WiX v4 extensions to support platform-specific custom actions. For more information, see https://wixtoolset.org/docs/fourthree/#converting-custom-wixui-dialog-sets."))
             {
-                element.Attribute("Value").Value = value + "_$(sys.BUILDARCHSHORT)";
+                element.Attribute("Value").Value = eventValue + "_$(sys.BUILDARCHSHORT)";
             }
         }
 
@@ -1982,8 +1996,9 @@ namespace WixToolset.Converters
             }
 
             var xScript = xCustomAction.Attribute("Script");
+            var collector = new InnerContentCollector();
 
-            if (xScript != null && TryGetInnerText(xCustomAction, out var scriptText, out var comments))
+            if (xScript != null && collector.CollectInnerTextWithTrailingWhitespaceAndCommentsForScriptFile(xCustomAction, out string value))
             {
                 if (this.OnInformation(ConverterTestType.InnerTextDeprecated, xCustomAction, "Using {0} element text is deprecated. Extract the text to a file and use the 'ScriptSourceFile' attribute to reference it.", xCustomAction.Name.LocalName))
                 {
@@ -1992,12 +2007,12 @@ namespace WixToolset.Converters
                     var ext = (xScript.Value == "jscript") ? ".js" : (xScript.Value == "vbscript") ? ".vbs" : ".txt";
 
                     var scriptFile = Path.Combine(scriptFolder, id + ext);
-                    File.WriteAllText(scriptFile, scriptText);
+                    File.WriteAllText(scriptFile, value);
 
                     RemoveChildren(xCustomAction);
                     xCustomAction.Add(new XAttribute("ScriptSourceFile", scriptFile));
 
-                    if (comments.Any())
+                    if (collector.Comments.Any())
                     {
                         var remainingNodes = xCustomAction.NodesAfterSelf().ToList();
                         var replacementNodes = remainingNodes.Where(e => XmlNodeType.Text != e.NodeType);
@@ -2005,7 +2020,7 @@ namespace WixToolset.Converters
                         {
                             node.Remove();
                         }
-                        foreach (var comment in comments)
+                        foreach (var comment in collector.Comments)
                         {
                             xCustomAction.Add(comment);
                             xCustomAction.Add("\n");
@@ -2144,24 +2159,23 @@ namespace WixToolset.Converters
 
         private void ConvertInnerTextToAttribute(XElement element, string attributeName)
         {
-            if (TryGetInnerText(element, out var text, out var comments))
+            var collector = new InnerContentCollector();
+
+            if (collector.CollectInnerTextAndCommentsForAttributeValue(element, out string value))
             {
                 // If the target attribute already exists, error if we have anything more than whitespace.
                 var attribute = element.Attribute(attributeName);
                 if (attribute != null)
                 {
-                    if (!String.IsNullOrWhiteSpace(text))
-                    {
-                        this.OnError(ConverterTestType.InnerTextDeprecated, attribute, "Using {0} element text is deprecated. Remove the element's text and use only the '{1}' attribute. See the conversion FAQ for more information: https://wixtoolset.org/docs/fourthree/faqs/#converting-packages", element.Name.LocalName, attributeName);
-                    }
+                    this.OnError(ConverterTestType.InnerTextDeprecated, attribute, "Using {0} element text is deprecated. Remove the element's text and use only the '{1}' attribute. See the conversion FAQ for more information: https://wixtoolset.org/docs/fourthree/faqs/#converting-packages", element.Name.LocalName, attributeName);
                 }
                 else if (this.OnInformation(ConverterTestType.InnerTextDeprecated, element, "Using {0} element text is deprecated. Use the '{1}' attribute instead.", element.Name.LocalName, attributeName))
                 {
                     using (var lab = new ConversionLab(element))
                     {
                         lab.RemoveOrphanTextNodes();
-                        element.Add(new XAttribute(attributeName, text));
-                        lab.AddCommentsAsSiblings(comments);
+                        element.Add(new XAttribute(attributeName, value));
+                        lab.AddCommentsAsSiblings(collector.Comments);
                     }
                 }
             }
@@ -2854,42 +2868,6 @@ namespace WixToolset.Converters
             }
         }
 
-        private static bool TryGetInnerText(XElement element, out string value, out List<XNode> comments)
-        {
-            return TryGetInnerText(element, out value, out comments, new List<XNode>());
-        }
-
-        private static bool TryGetInnerText(XElement element, out string value, out List<XNode> comments, List<XNode> initialComments)
-        {
-            value = null;
-            comments = null;
-            var found = false;
-
-            var nodes = element.Nodes().ToList();
-            comments = initialComments;
-            var nonCommentNodes = new List<XNode>();
-
-            foreach (var node in nodes)
-            {
-                if (XmlNodeType.Comment == node.NodeType)
-                {
-                    comments.Add(node);
-                }
-                else
-                {
-                    nonCommentNodes.Add(node);
-                }
-            }
-
-            if (nonCommentNodes.Any() && nonCommentNodes.All(e => e.NodeType == XmlNodeType.Text || e.NodeType == XmlNodeType.CDATA))
-            {
-                value = String.Join(String.Empty, nonCommentNodes.Cast<XText>().Select(TrimTextValue));
-                found = true;
-            }
-
-            return found;
-        }
-
         private static bool IsTextNode(XNode node, out XText text)
         {
             text = null;
@@ -2910,22 +2888,6 @@ namespace WixToolset.Converters
             }
         }
 
-        private static string TrimTextValue(XText text)
-        {
-            var value = text.Value;
-
-            if (String.IsNullOrEmpty(value))
-            {
-                return String.Empty;
-            }
-            else if (text.NodeType == XmlNodeType.CDATA && String.IsNullOrWhiteSpace(value))
-            {
-                return " ";
-            }
-
-            return value.Trim();
-        }
-
         private static void RemoveChildren(XElement element)
         {
             var nodes = element.Nodes().ToList();
@@ -2975,6 +2937,250 @@ namespace WixToolset.Converters
             return true;
         }
 
+        // This class encapsulates methods for extraving text and comments from XElements. Multiple calls can be made to the collection
+        // methods to processs multiple XElements. The Comments property is used to extract the list of comments accumulated during the collection process.
+        private class InnerContentCollector
+        {
+            public InnerContentCollector()
+            {
+                this.Comments = new List<XNode>();
+            }
+
+            public List<XNode> Comments { get; private set; }
+
+            public bool CollectInnerTextAndCommentsForAttributeValue(XElement element, out string collectedText)
+            {
+                char[] whitespaceChars = { ' ', '\t', '\r', '\n' };
+                var nodes = element.Nodes().ToList();
+                var inWhitespace = false;
+                var cDataFound = false;
+                var sb = new StringBuilder();
+
+                foreach (var node in nodes)
+                {
+                    if (XmlNodeType.Comment == node.NodeType)
+                    {
+                        this.Comments.Add(node);
+                    }
+                    else if (XmlNodeType.CDATA == node.NodeType || XmlNodeType.Text == node.NodeType)
+                    {
+                        var isCData = XmlNodeType.CDATA == node.NodeType;
+
+                        if (isCData)
+                        {
+                            cDataFound = true;
+                        }
+
+                        var text = node is XText xtext ? xtext.Value : String.Empty;
+                        var nodeSB = new StringBuilder();
+
+                        foreach (var c in text)
+                        {
+                            char? emit = c;
+
+                            // Replace contiguous whitespace with a single space.
+                            if (' ' == c || '\r' == c || '\n' == c || '\t' == c)
+                            {
+                                if (!inWhitespace)
+                                {
+                                    inWhitespace = true;
+                                    emit = ' ';
+                                }
+                                else
+                                {
+                                    emit = null;
+                                }
+                            }
+                            else
+                            {
+                                inWhitespace = false;
+                            }
+
+                            if (emit.HasValue)
+                            {
+                                nodeSB.Append(emit);
+                            }
+                        }
+
+                        text = nodeSB.ToString().Trim(whitespaceChars);
+                        sb.Append(text);
+                    }
+                }
+                var found = false;
+                collectedText = sb.ToString();
+
+                if (0 < collectedText.Length)
+                {
+                    found = true;
+                }
+
+                collectedText = collectedText.Trim(whitespaceChars);
+
+                if (cDataFound)
+                {
+                    found = true;
+
+                    if (0 == collectedText.Length)
+                    {
+                        collectedText = " ";
+                    }
+                }
+
+                return found;
+            }
+
+            public bool CollectInnerTextWithTrailingWhitespaceAndCommentsForAttributeValue(XElement element, out string collectedText)
+            {
+                char[] whitespaceChars = { ' ', '\t', '\r', '\n' };
+                var nodes = element.Nodes().ToList();
+                var inWhitespace = false;
+                var cDataFound = false;
+                var whitespaceFound = false;
+                var sb = new StringBuilder();
+
+                foreach (var node in nodes)
+                {
+                    if (XmlNodeType.Comment == node.NodeType)
+                    {
+                        this.Comments.Add(node);
+                    }
+                    else if (XmlNodeType.CDATA == node.NodeType || XmlNodeType.Text == node.NodeType)
+                    {
+                        var isCData = XmlNodeType.CDATA == node.NodeType;
+
+                        if (isCData)
+                        {
+                            cDataFound = true;
+                        }
+
+                        var text = node is XText xtext ? xtext.Value : String.Empty;
+                        var nodeSB = new StringBuilder();
+
+                        foreach (var c in text)
+                        {
+                            char? emit = c;
+
+                            // Replace contiguous whitespace with a single space.
+                            if (' ' == c || '\r' == c || '\n' == c || '\t' == c)
+                            {
+                                if (!inWhitespace)
+                                {
+                                    inWhitespace = true;
+                                    whitespaceFound = true;
+                                    emit = ' ';
+                                }
+                                else
+                                {
+                                    emit = null;
+                                }
+                            }
+                            else
+                            {
+                                inWhitespace = false;
+                            }
+
+                            if (emit.HasValue)
+                            {
+                                nodeSB.Append(emit);
+                            }
+                        }
+
+                        text = nodeSB.ToString();
+
+                        if (0 < text.Length)
+                        {
+                            text = text.Trim(whitespaceChars);
+
+                            if (0 == text.Length)
+                            {
+                                text = " ";
+                            }
+                        }
+
+                        sb.Append(text);
+                    }
+                }
+                var found = false;
+                collectedText = sb.ToString();
+
+                if (0 < collectedText.Length)
+                {
+                    found = true;
+                }
+
+                collectedText = collectedText.Trim(whitespaceChars);
+
+                if (whitespaceFound)
+                {
+                    found = true;
+                }
+
+                if (cDataFound)
+                {
+                    found = true;
+
+                    if (0 == collectedText.Length)
+                    {
+                        collectedText = " ";
+                    }
+                }
+
+                return found;
+            }
+
+            public bool CollectInnerTextWithTrailingWhitespaceAndCommentsForScriptFile(XElement element, out string collectedText)
+            {
+                var value = String.Empty;
+                char[] whitespaceChars = { ' ', '\t', '\r', '\n' };
+                var nodes = element.Nodes().ToList();
+                var cDataFound = false;
+                var sb = new StringBuilder();
+
+                foreach (var node in nodes)
+                {
+                    if (XmlNodeType.Comment == node.NodeType)
+                    {
+                        this.Comments.Add(node);
+                    }
+                    else if (XmlNodeType.CDATA == node.NodeType || XmlNodeType.Text == node.NodeType)
+                    {
+                        var isCData = XmlNodeType.CDATA == node.NodeType;
+
+                        if (isCData)
+                        {
+                            cDataFound = true;
+                        }
+
+                        var text = node is XText xtext ? xtext.Value.Trim(whitespaceChars) : String.Empty;
+                        sb.Append(text);
+                    }
+                }
+
+                var found = false;
+
+                collectedText = sb.ToString();
+
+                if (0 < collectedText.Length)
+                {
+                    found = true;
+                }
+
+                collectedText = collectedText.Trim(whitespaceChars);
+
+                if (cDataFound)
+                {
+                    found = true;
+
+                    if (0 == collectedText.Length)
+                    {
+                        collectedText = " ";
+                    }
+                }
+
+                return found;
+            }
+        }
+
         /// <summary>
         /// Converter test types. These are used to condition error messages down to warnings.
         /// </summary>
diff --git a/src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs b/src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs
index e3563c60..f9b60673 100644
--- a/src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs
@@ -21,8 +21,8 @@ namespace WixToolsetTest.Converters
                 "    <UI>",
                 "      <Dialog Id='Dlg1'>",
                 "        <Control Id='Control1'>",
-                "          <Condition Action='disable'>x=y</Condition>",
-                "          <Condition Action='hide'>a&lt;>b</Condition>",
+                "          <Condition Action='disable'>$(var.x)=$(var.y)</Condition>",
+                "          <Condition Action='hide'>$(var.a)&lt;>$(var.b)</Condition>",
                 "        </Control>",
                 "      </Dialog>",
                 "    </UI>",
@@ -35,7 +35,7 @@ namespace WixToolsetTest.Converters
                 "  <Fragment>",
                 "    <UI>",
                 "      <Dialog Id=\"Dlg1\">",
-                "        <Control Id=\"Control1\" DisableCondition=\"x=y\" HideCondition=\"a&lt;&gt;b\" />",
+                "        <Control Id=\"Control1\" DisableCondition=\"$(var.x)=$(var.y)\" HideCondition=\"$(var.a)&lt;&gt;$(var.b)\" />",
                 "      </Dialog>",
                 "    </UI>",
                 "  </Fragment>",
@@ -64,8 +64,8 @@ namespace WixToolsetTest.Converters
                 "    <UI>",
                 "      <Dialog Id='Dlg1'>",
                 "        <Control Id='Control1'>",
-                "          <Condition Action='hide'>x=y</Condition>",
-                "          <Condition Action='hide'>a&lt;>b</Condition>",
+                "          <Condition Action='hide'>$(var.x)=$(var.y)</Condition>",
+                "          <Condition Action='hide'>$(var.a)&lt;>$(var.b)</Condition>",
                 "        </Control>",
                 "      </Dialog>",
                 "    </UI>",
@@ -78,7 +78,7 @@ namespace WixToolsetTest.Converters
                 "  <Fragment>",
                 "    <UI>",
                 "      <Dialog Id=\"Dlg1\">",
-                "        <Control Id=\"Control1\" HideCondition=\"(x=y) OR (a&lt;&gt;b)\" />",
+                "        <Control Id=\"Control1\" HideCondition=\"($(var.x)=$(var.y)) OR ($(var.a)&lt;&gt;$(var.b))\" />",
                 "      </Dialog>",
                 "    </UI>",
                 "  </Fragment>",
@@ -107,8 +107,8 @@ namespace WixToolsetTest.Converters
                 "    <UI>",
                 "      <Dialog Id='Dlg1'>",
                 "        <Control Id='Control1'>",
-                "          <Condition Action='disable'><!-- Comment 1 -->x=y</Condition>",
-                "          <Condition Action='hide'><!-- Comment 2 -->a&lt;>b</Condition>",
+                "          <Condition Action='disable'><!-- Comment 1 -->$(var.x)=$(var.y)</Condition>",
+                "          <Condition Action='hide'><!-- Comment 2 -->$(var.a)&lt;>$(var.b)</Condition>",
                 "        </Control>",
                 "      </Dialog>",
                 "    </UI>",
@@ -123,7 +123,91 @@ namespace WixToolsetTest.Converters
                 "      <Dialog Id=\"Dlg1\">",
                 "        <!-- Comment 1 -->",
                 "        <!-- Comment 2 -->",
-                "        <Control Id=\"Control1\" DisableCondition=\"x=y\" HideCondition=\"a&lt;&gt;b\" />",
+                "        <Control Id=\"Control1\" DisableCondition=\"$(var.x)=$(var.y)\" HideCondition=\"$(var.a)&lt;&gt;$(var.b)\" />",
+                "      </Dialog>",
+                "    </UI>",
+                "  </Fragment>",
+                "</Wix>"
+            };
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new MockMessaging();
+            var converter = new WixConverter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+            Assert.Equal(4, errors);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
+
+        [Fact]
+        public void DemonstrateTheHandlingOfQuotedBackslashesInInnerText()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
+                "  <Fragment>",
+                "    <UI>",
+                "      <Dialog Id='Dlg1'>",
+                "        <Control Id='Control1'>",
+                "          <Condition Action='hide'>\"\\\"=$(var.separator)</Condition>",
+                "        </Control>",
+                "      </Dialog>",
+                "    </UI>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <UI>",
+                "      <Dialog Id=\"Dlg1\">",
+                "        <Control Id=\"Control1\" HideCondition=\"&quot;\\&quot;=$(var.separator)\" />",
+                "      </Dialog>",
+                "    </UI>",
+                "  </Fragment>",
+                "</Wix>"
+            };
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new MockMessaging();
+            var converter = new WixConverter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
+
+        [Fact]
+        public void FixControlConditionWithStringConstants()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
+                "  <Fragment>",
+                "    <UI>",
+                "      <Dialog Id='Dlg1'>",
+                "        <Control Id='Control1'>",
+                "          <Condition Action='hide'>\"x\"=$(var.y)</Condition>",
+                "          <Condition Action='hide'>\"x's\"=$(var.y)</Condition>",
+                "        </Control>",
+                "      </Dialog>",
+                "    </UI>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <UI>",
+                "      <Dialog Id=\"Dlg1\">",
+                "        <Control Id=\"Control1\" HideCondition=\"(&quot;x&quot;=$(var.y)) OR (&quot;x's&quot;=$(var.y))\" />",
                 "      </Dialog>",
                 "    </UI>",
                 "  </Fragment>",
@@ -306,6 +390,78 @@ namespace WixToolsetTest.Converters
         }
 
         [Fact]
+        public void FixMultilineComponentCondition()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
+                "  <Fragment>",
+                "    <Component Id='Comp1' Directory='ApplicationFolder'>",
+                "      <Condition>1&lt;2</Condition>",
+                "    </Component>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <Component Id=\"Comp1\" Directory=\"ApplicationFolder\" Condition=\"1&lt;2\" />",
+                "  </Fragment>",
+                "</Wix>"
+            };
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new MockMessaging();
+            var converter = new WixConverter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+            Assert.Equal(3, errors);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
+
+        [Fact]
+        public void FixMultilineComponentConditionWithComment()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
+                "  <Fragment>",
+                "    <Component Id='Comp1' Directory='ApplicationFolder'>",
+                "      <Condition>",
+                "        <!-- Comment -->",
+                "        1&lt;2 OR ",
+                "        4&lt;3",
+                "      </Condition>",
+                "    </Component>",
+                "  </Fragment>",
+                "</Wix>");
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <!-- Comment -->",
+                "    <Component Id=\"Comp1\" Directory=\"ApplicationFolder\" Condition=\"1&lt;2 OR 4&lt;3\" />",
+                "  </Fragment>",
+                "</Wix>"
+            };
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new MockMessaging();
+            var converter = new WixConverter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+            Assert.Equal(3, errors);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
+
+        [Fact]
         public void FixEmptyCondition()
         {
             var parse = String.Join(Environment.NewLine,
@@ -481,6 +637,90 @@ namespace WixToolsetTest.Converters
         }
 
         [Fact]
+        public void FixMultilineFeatureCondition()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
+                "  <Fragment>",
+                "    <Feature Id='ShellExtensionFeature' Level='0' InstallDefault='local' >",
+                "      <Condition Level='1'>",
+                "        (NOT Installed AND NOT PERUSER) OR",
+                "        (Installed AND ZOS_SHELL_EXTENSION_INSTALLLED)",
+                "      </Condition>",
+                "      <ComponentGroupRef Id='ShellExtComponents' />",
+                "    </Feature>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <Feature Id=\"ShellExtensionFeature\" Level=\"0\" InstallDefault=\"local\">",
+                "      <Level Value=\"1\" Condition=\"(NOT Installed AND NOT PERUSER) OR (Installed AND ZOS_SHELL_EXTENSION_INSTALLLED)\" />",
+                "      <ComponentGroupRef Id=\"ShellExtComponents\" />",
+                "    </Feature>",
+                "  </Fragment>",
+                "</Wix>"
+            };
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new MockMessaging();
+            var converter = new WixConverter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+            Assert.Equal(3, errors);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
+
+        [Fact]
+        public void FixMultilineFeatureConditionWithComment()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
+                "  <Fragment>",
+                "    <Feature Id='ShellExtensionFeature' Level='0' InstallDefault='local' >",
+                "      <Condition Level='1'>",
+                "        <!-- Comment -->",
+                "        (NOT Installed AND NOT PERUSER) OR",
+                "        (Installed AND ZOS_SHELL_EXTENSION_INSTALLLED)",
+                "      </Condition>",
+                "      <ComponentGroupRef Id='ShellExtComponents' />",
+                "    </Feature>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <Feature Id=\"ShellExtensionFeature\" Level=\"0\" InstallDefault=\"local\">",
+                "      <!-- Comment -->",
+                "      <Level Value=\"1\" Condition=\"(NOT Installed AND NOT PERUSER) OR (Installed AND ZOS_SHELL_EXTENSION_INSTALLLED)\" />",
+                "      <ComponentGroupRef Id=\"ShellExtComponents\" />",
+                "    </Feature>",
+                "  </Fragment>",
+                "</Wix>"
+            };
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new MockMessaging();
+            var converter = new WixConverter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+            Assert.Equal(3, errors);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
+
+        [Fact]
         public void FixLaunchConditionInFragment()
         {
             var parse = String.Join(Environment.NewLine,
@@ -519,7 +759,7 @@ namespace WixToolsetTest.Converters
         }
 
         [Fact]
-        public void FixLaunchConditionWithComment()
+        public void FixLaunchConditionInFragmentWithComment()
         {
             var parse = String.Join(Environment.NewLine,
                 "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
@@ -559,6 +799,87 @@ namespace WixToolsetTest.Converters
         }
 
         [Fact]
+        public void FixMultilineLaunchConditionInFragment()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
+                "  <Fragment>",
+                "    <Condition Message='Stop the install'>",
+                "      1&lt;2 OR ",
+                "      4&lt;3",
+                "    </Condition>",
+                "    <Condition Message='Do not stop'>",
+                "      1=2",
+                "    </Condition>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <Launch Condition=\"1&lt;2 OR 4&lt;3\" Message=\"Stop the install\" />",
+                "    <Launch Condition=\"1=2\" Message=\"Do not stop\" />",
+                "  </Fragment>",
+                "</Wix>"
+            };
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new MockMessaging();
+            var converter = new WixConverter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+            Assert.Equal(4, errors);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
+
+        [Fact]
+        public void FixMultilineLaunchConditionInFragmentWithComment()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
+                "  <Fragment>",
+                "    <Condition Message='Stop the install'>",
+                "      <!-- Comment 1 -->",
+                "      1&lt;2 OR",
+                "      4&lt;3",
+                "    </Condition>",
+                "    <Condition Message='Do not stop'>",
+                "      <!-- Comment 2 -->1=2",
+                "    </Condition>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <!-- Comment 1 -->",
+                "    <Launch Condition=\"1&lt;2 OR 4&lt;3\" Message=\"Stop the install\" />",
+                "    <!-- Comment 2 -->",
+                "    <Launch Condition=\"1=2\" Message=\"Do not stop\" />",
+                "  </Fragment>",
+                "</Wix>"
+            };
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new MockMessaging();
+            var converter = new WixConverter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+            Assert.Equal(4, errors);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
+
+        [Fact]
         public void FixLaunchConditionInProduct()
         {
             var parse = String.Join(Environment.NewLine,