From cdef9c078068b7dc23b348b2142dc13dd5a936fb Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Mon, 31 Aug 2020 16:33:53 -0400
Subject: Convert Feature/@Absent=disallow to AllowAbsent=no.

---
 src/WixToolset.Converters/WixConverter.cs          |  8 ++---
 .../WixToolsetTest.Converters/FeatureFixture.cs    | 34 +++++++++++++++++++++-
 2 files changed, 37 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/WixToolset.Converters/WixConverter.cs
index f6918702..f10875f1 100644
--- a/src/WixToolset.Converters/WixConverter.cs
+++ b/src/WixToolset.Converters/WixConverter.cs
@@ -560,9 +560,9 @@ namespace WixToolset.Converters
             if (xAbsent != null &&
                 this.OnError(ConverterTestType.FeatureAbsentAttributeReplaced, element, "The Feature element's Absent attribute has been replaced with the AllowAbsent attribute. Use the 'AllowAbsent' attribute instead."))
             {
-                if (xAbsent.Value == "allow")
+                if (xAbsent.Value == "disallow")
                 {
-                    element.Add(new XAttribute("AllowAbsent", "yes"));
+                    element.Add(new XAttribute("AllowAbsent", "no"));
                 }
                 xAbsent.Remove();
             }
@@ -571,12 +571,12 @@ namespace WixToolset.Converters
             if (xAllowAdvertise != null)
             {
                 if ((xAllowAdvertise.Value == "system" || xAllowAdvertise.Value == "allow") &&
-                    this.OnError(ConverterTestType.FeatureAllowAdvertiseValueDeprecated, element, "The AllowAdvertise attribute's '{0}' value deprecated. Set the value to 'yes' instead.", xAllowAdvertise.Value))
+                    this.OnError(ConverterTestType.FeatureAllowAdvertiseValueDeprecated, element, "The AllowAdvertise attribute's '{0}' value is deprecated. Set the value to 'yes' instead.", xAllowAdvertise.Value))
                 {
                     xAllowAdvertise.Value = "yes";
                 }
                 else if (xAllowAdvertise.Value == "disallow" &&
-                    this.OnError(ConverterTestType.FeatureAllowAdvertiseValueDeprecated, element, "The AllowAdvertise attribute's '{0}' value deprecated. Remove the value instead.", xAllowAdvertise.Value))
+                    this.OnError(ConverterTestType.FeatureAllowAdvertiseValueDeprecated, element, "The AllowAdvertise attribute's '{0}' value is deprecated. Remove the value instead.", xAllowAdvertise.Value))
                 {
                     xAllowAdvertise.Remove();
                 }
diff --git a/src/test/WixToolsetTest.Converters/FeatureFixture.cs b/src/test/WixToolsetTest.Converters/FeatureFixture.cs
index 9d943773..8240945d 100644
--- a/src/test/WixToolsetTest.Converters/FeatureFixture.cs
+++ b/src/test/WixToolsetTest.Converters/FeatureFixture.cs
@@ -25,7 +25,7 @@ namespace WixToolsetTest.Converters
             {
                 "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
                 "  <Fragment>",
-                "    <Feature AllowAdvertise=\"yes\" AllowAbsent=\"yes\" />",
+                "    <Feature AllowAdvertise=\"yes\" />",
                 "  </Fragment>",
                 "</Wix>"
             };
@@ -42,6 +42,38 @@ namespace WixToolsetTest.Converters
             CompareLineByLine(expected, actualLines);
         }
 
+        [Fact]
+        public void FixDisallowAttributes()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>",
+                "  <Fragment>",
+                "    <Feature Absent='disallow' AllowAdvertise='no' />",
+                "  </Fragment>",
+                "</Wix>");
+
+            var expected = new[]
+            {
+                "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <Fragment>",
+                "    <Feature AllowAdvertise=\"no\" AllowAbsent=\"no\" />",
+                "  </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);
+            CompareLineByLine(expected, actualLines);
+        }
+
         [Fact]
         public void RemoveDeprecatedAllowAdvertiseAttributes()
         {
-- 
cgit v1.2.3-55-g6feb