Correctly report error when Publish/@Condition='1'

2 files changed, 8 insertions, 2 deletions

diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/WixToolset.Converters/WixConverter.cs
index bfeed03e..3ea0c3dc 100644
--- a/src/WixToolset.Converters/WixConverter.cs
+++ b/src/WixToolset.Converters/WixConverter.cs
@@ -693,7 +693,8 @@ namespace WixToolset.Converters
             this.ConvertInnerTextToAttribute(element, "Condition");
 
             var xCondition = element.Attribute("Condition");
-            if (xCondition?.Value == "1")
+            if (xCondition?.Value == "1" &&
+                this.OnError(ConverterTestType.PublishConditionOneUnnecessary, element, "Adding Condition='1' on {0} elements is no longer necessary. Remove the Condition attribute.", xCondition.Name.LocalName))
             {
                 xCondition.Remove();
             }
@@ -1207,6 +1208,11 @@ namespace WixToolset.Converters
             /// The Feature AllowAdvertise attribute value deprecated.
             /// </summary>
             FeatureAllowAdvertiseValueDeprecated,
+
+            /// <summary>
+            /// The Condition='1' attribute is unnecessary on Publish elements.
+            /// </summary>
+            PublishConditionOneUnnecessary
         }
     }
 }
diff --git a/src/test/WixToolsetTest.Converters/ConditionFixture.cs b/src/test/WixToolsetTest.Converters/ConditionFixture.cs
index 34f99306..d8e5b392 100644
--- a/src/test/WixToolsetTest.Converters/ConditionFixture.cs
+++ b/src/test/WixToolsetTest.Converters/ConditionFixture.cs
@@ -96,7 +96,7 @@ namespace WixToolsetTest.Converters
             var converter = new WixConverter(messaging, 2, null, null);
 
             var errors = converter.ConvertDocument(document);
-            Assert.Equal(4, errors);
+            Assert.Equal(5, errors);
 
             var actualLines = UnformattedDocumentLines(document);
             CompareLineByLine(expected, actualLines);