2 files changed, 359 insertions, 16 deletions

diff --git a/src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs b/src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs
index daf66a8b..c9fecc94 100644
--- a/src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs
@@ -35,13 +35,55 @@ namespace WixToolsetTest.Converters
                 "  <Fragment>",
                 "    <UI>",
                 "      <Dialog Id=\"Dlg1\">",
-                "        <Control Id=\"Control1\" DisableCondition=\"x=y\" HideCondition=\"a&lt;&gt;b\">",
-                "          ",
-                "          ",
+                "        <Control Id=\"Control1\" DisableCondition=\"x=y\" HideCondition=\"a&lt;&gt;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 FixControlConditionWithComment()
+        {
+            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='disable'><!-- Comment 1 -->x=y</Condition>",
+                "          <Condition Action='hide'><!-- Comment 2 -->a&lt;>b</Condition>",
                 "        </Control>",
                 "      </Dialog>",
                 "    </UI>",
                 "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <UI>",
+                "      <Dialog Id=\"Dlg1\">",
+                "        <!-- Comment 1 -->",
+                "        <!-- Comment 2 -->",
+                "        <Control Id=\"Control1\" DisableCondition=\"x=y\" HideCondition=\"a&lt;&gt;b\" />",
+                "      </Dialog>",
+                "    </UI>",
+                "  </Fragment>",
                 "</Wix>"
             };
 
@@ -102,6 +144,53 @@ namespace WixToolsetTest.Converters
             var actualLines = UnformattedDocumentLines(document);
             WixAssert.CompareLineByLine(expected, actualLines);
         }
+        [Fact]
+        public void FixPublishConditionWithComment()
+        {
+            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'>",
+                "          <Publish Value='abc'><!-- Comment 1 -->1&lt;2</Publish>",
+                "          <Publish Value='gone'><!-- Comment 2 -->1</Publish>",
+                "        </Control>",
+                "      </Dialog>",
+                "    </UI>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <UI>",
+                "      <Dialog Id=\"Dlg1\">",
+                "        <Control Id=\"Control1\">",
+                "          <!-- Comment 1 -->",
+                "          <Publish Value=\"abc\" Condition=\"1&lt;2\" />",
+                "          <!-- Comment 2 -->",
+                "          <Publish Value=\"gone\" />",
+                "        </Control>",
+                "      </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(5, errors);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
 
         [Fact]
         public void FixComponentCondition()
@@ -120,10 +209,43 @@ namespace WixToolsetTest.Converters
             {
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "  <Fragment>",
-                "    <Component Id=\"Comp1\" Directory=\"ApplicationFolder\" Condition=\"1&lt;2\">",
-                "      ",
+                "    <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 FixComponentConditionWithComment()
+        {
+            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</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\" />",
+                "  </Fragment>",
                 "</Wix>"
             };
 
@@ -175,27 +297,24 @@ namespace WixToolsetTest.Converters
             Assert.Equal(4, errors);
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void FixConditionWithComment()
         {
             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='commented cdata'>",
-                "        <!-- commented condition -->",
-                "        <![CDATA[cdatacontent]]>",
-                "    </Condition>",
+                "    <Condition Message='commented cdata'><!-- commented conditional -->",
+                "<![CDATA[cdatacontent]]></Condition>",
                 "  </Fragment>",
                 "</Wix>");
 
-            //TODO: expected value is not set in stone but must have replaced Condition element with Launch and should have kept the comment.
             var expected = new[]
             {
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "  <Fragment>",
+                "    <!-- commented conditional -->",
                 "    <Launch Condition=\"cdatacontent\" Message=\"commented cdata\" />",
-                "        <!-- commented condition -->",
                 "  </Fragment>",
                 "</Wix>"
             };
@@ -210,7 +329,7 @@ namespace WixToolsetTest.Converters
             var actualLines = UnformattedDocumentLines(document);
             WixAssert.CompareLineByLine(expected, actualLines);
 
-            Assert.Equal(2, errors);
+            Assert.Equal(3, errors);
         }
 
         [Fact]
@@ -285,6 +404,43 @@ namespace WixToolsetTest.Converters
         }
 
         [Fact]
+        public void FixFeatureConditionWithComment()
+        {
+            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='Feature1'>",
+                "      <Condition Level='0'><!-- Comment -->PROP = 1</Condition>",
+                "    </Feature>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <Feature Id=\"Feature1\">",
+                "      <!-- Comment -->",
+                "      <Level Value=\"0\" Condition=\"PROP = 1\" />",
+                "    </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 FixLaunchCondition()
         {
             var parse = String.Join(Environment.NewLine,
@@ -323,6 +479,46 @@ namespace WixToolsetTest.Converters
         }
 
         [Fact]
+        public void FixLaunchConditionWithComment()
+        {
+            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",
+                "    </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\" 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,
@@ -363,6 +559,48 @@ namespace WixToolsetTest.Converters
         }
 
         [Fact]
+        public void FixLaunchConditionInProductWithComment()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
+                "  <Product>",
+                "  <Package />",
+                "    <Condition Message='Stop the install'>",
+                "      <!-- Comment 1 -->1&lt;2",
+                "    </Condition>",
+                "    <Condition Message='Do not stop'>",
+                "      <!-- Comment 2 -->1=2",
+                "    </Condition>",
+                "  </Product>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Package Compressed=\"no\">",
+                "  ",
+                "    <!-- Comment 1 -->",
+                "    <Launch Condition=\"1&lt;2\" Message=\"Stop the install\" />",
+                "    <!-- Comment 2 -->",
+                "    <Launch Condition=\"1=2\" Message=\"Do not stop\" />",
+                "  </Package>",
+                "</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(6, errors);
+
+            var actualLines = UnformattedDocumentLines(document);
+            WixAssert.CompareLineByLine(expected, actualLines);
+        }
+
+        [Fact]
         public void FixPermissionExCondition()
         {
             var parse = String.Join(Environment.NewLine,
@@ -383,11 +621,49 @@ namespace WixToolsetTest.Converters
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "  <Fragment>",
                 "    <Component Id=\"Comp1\" Directory=\"ApplicationFolder\">",
-                "      <PermissionEx Sddl=\"sddl\" Condition=\"1&lt;2\">",
-                "        ",
+                "      <PermissionEx Sddl=\"sddl\" Condition=\"1&lt;2\" />",
+                "    </Component>",
+                "  </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 FixPermissionExConditionWithComment()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<!-- Comment 1 -->",
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
+                "  <Fragment>",
+                "    <Component Id='Comp1' Guid='*' Directory='ApplicationFolder'>",
+                "      <PermissionEx Sddl='sddl'>",
+                "        <Condition><!-- Comment 2 -->1&lt;2</Condition>",
                 "      </PermissionEx>",
                 "    </Component>",
                 "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<!-- Comment 1 -->",
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <Component Id=\"Comp1\" Directory=\"ApplicationFolder\">",
+                "      <!-- Comment 2 -->",
+                "      <PermissionEx Sddl=\"sddl\" Condition=\"1&lt;2\" />",
+                "    </Component>",
+                "  </Fragment>",
                 "</Wix>"
             };
 
diff --git a/src/wix/test/WixToolsetTest.Converters/UtilExtensionFixture.cs b/src/wix/test/WixToolsetTest.Converters/UtilExtensionFixture.cs
index 10450c68..0f23d87b 100644
--- a/src/wix/test/WixToolsetTest.Converters/UtilExtensionFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/UtilExtensionFixture.cs
@@ -45,6 +45,40 @@ namespace WixToolsetTest.Converters
         }
 
         [Fact]
+        public void FixCloseAppsConditionWithComment()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util='http://schemas.microsoft.com/wix/UtilExtension'>",
+                "  <Fragment>",
+                "    <util:CloseApplication Id='EndApp' Target='example.exe'>",
+                "      <!-- Comment -->a&lt;>b",
+                "    </util:CloseApplication>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\" xmlns:util=\"http://wixtoolset.org/schemas/v4/wxs/util\">",
+                "  <Fragment>",
+                "    <!-- Comment -->",
+                "    <util:CloseApplication Id=\"EndApp\" Target=\"example.exe\" Condition=\"a&lt;&gt;b\" />",
+                "  </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 FixXmlConfigValue()
         {
             var parse = String.Join(Environment.NewLine,
@@ -78,6 +112,40 @@ namespace WixToolsetTest.Converters
         }
 
         [Fact]
+        public void FixXmlConfigValueWithComment()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util='http://schemas.microsoft.com/wix/UtilExtension'>",
+                "  <Fragment>",
+                "    <util:XmlConfig Id='Change' ElementPath='book'>",
+                "      <!-- Comment -->a&lt;>b",
+                "    </util:XmlConfig>",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\" xmlns:util=\"http://wixtoolset.org/schemas/v4/wxs/util\">",
+                "  <Fragment>",
+                "    <!-- Comment -->",
+                "    <util:XmlConfig Id=\"Change\" ElementPath=\"book\" Value=\"a&lt;&gt;b\" />",
+                "  </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 WarnsOnAllRegistryValueSearches()
         {
             var parse = String.Join(Environment.NewLine,
@@ -112,7 +180,6 @@ namespace WixToolsetTest.Converters
             WixAssert.CompareLineByLine(expected, actualLines);
         }
 
-
         [Fact]
         public void FixXmlConfigValueCData()
         {