Correctly convert Controls with multiple Conditions with same action

Fixes 7142

2 files changed, 54 insertions, 1 deletions

diff --git a/src/wix/WixToolset.Converters/WixConverter.cs b/src/wix/WixToolset.Converters/WixConverter.cs
index 3d844b44..f962dc9c 100644
--- a/src/wix/WixToolset.Converters/WixConverter.cs
+++ b/src/wix/WixToolset.Converters/WixConverter.cs
@@ -1013,6 +1013,7 @@ namespace WixToolset.Converters
             {
                 var xConditions = element.Elements(ConditionElementName).ToList();
                 var comments = new List<XNode>();
+                var conditions = new List<KeyValuePair<string, string>>();
 
                 foreach (var xCondition in xConditions)
                 {
@@ -1021,10 +1022,19 @@ namespace WixToolset.Converters
                         TryGetInnerText(xCondition, out var text, out comments, comments) &&
                         this.OnInformation(ConverterTestType.InnerTextDeprecated, element, "Using {0} element text is deprecated. Use the '{1}Condition' attribute instead.", xCondition.Name.LocalName, action))
                     {
-                        element.Add(new XAttribute(action + "Condition", text));
+                        conditions.Add(new KeyValuePair<string, string>(action, text));
                     }
                 }
 
+                foreach (var actionCondition in conditions.GroupBy(c => c.Key))
+                {
+                    var conditionValues = actionCondition.Select(c => c.Value).ToList();
+
+                    var finalCondition = (conditionValues.Count == 1) ? conditionValues.Single() : String.Join(" OR ", conditionValues.Select(c => $"({c})"));
+
+                    element.Add(new XAttribute(actionCondition.Key + "Condition", finalCondition));
+                }
+
                 foreach (var xCondition in xConditions)
                 {
                     xCondition.Remove();
diff --git a/src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs b/src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs
index d8a55402..24dee1c6 100644
--- a/src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/ConditionFixture.cs
@@ -55,6 +55,49 @@ namespace WixToolsetTest.Converters
         }
 
         [Fact]
+        public void FixDoubleControlCondition()
+        {
+            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=y</Condition>",
+                "          <Condition Action='hide'>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\">",
+                "        <Control Id=\"Control1\" HideCondition=\"(x=y) OR (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,