From 8b1861a0d9fc636f02ccb9452946863e31a46b78 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@joyofsetup.com>
Date: Thu, 31 Oct 2019 20:10:49 -0400
Subject: Add namespace to <Include> elements.

---
 src/WixToolset.Converters/Wix3Converter.cs         |  6 +++--
 .../WixToolsetTest.Converters/ConverterFixture.cs  | 31 +++++++++++++++++++++-
 2 files changed, 34 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/WixToolset.Converters/Wix3Converter.cs b/src/WixToolset.Converters/Wix3Converter.cs
index c23930b6..9fde7360 100644
--- a/src/WixToolset.Converters/Wix3Converter.cs
+++ b/src/WixToolset.Converters/Wix3Converter.cs
@@ -35,6 +35,7 @@ namespace WixToolset.Converters
         private static readonly XName CustomActionElementName = WixNamespace + "CustomAction";
         private static readonly XName PropertyElementName = WixNamespace + "Property";
         private static readonly XName WixElementWithoutNamespaceName = XNamespace.None + "Wix";
+        private static readonly XName IncludeElementWithoutNamespaceName = XNamespace.None + "Include";
 
         private static readonly Dictionary<string, XNamespace> OldToNewNamespaceMapping = new Dictionary<string, XNamespace>()
         {
@@ -86,7 +87,8 @@ namespace WixToolset.Converters
                 { Wix3Converter.PayloadElementName, this.ConvertSuppressSignatureValidation },
                 { Wix3Converter.CustomActionElementName, this.ConvertCustomActionElement },
                 { Wix3Converter.PropertyElementName, this.ConvertPropertyElement },
-                { Wix3Converter.WixElementWithoutNamespaceName, this.ConvertWixElementWithoutNamespace },
+                { Wix3Converter.WixElementWithoutNamespaceName, this.ConvertElementWithoutNamespace },
+                { Wix3Converter.IncludeElementWithoutNamespaceName, this.ConvertElementWithoutNamespace },
             };
 
             this.Messaging = messaging;
@@ -399,7 +401,7 @@ namespace WixToolset.Converters
         /// </summary>
         /// <param name="element">The Wix element to convert.</param>
         /// <returns>The converted element.</returns>
-        private void ConvertWixElementWithoutNamespace(XElement element)
+        private void ConvertElementWithoutNamespace(XElement element)
         {
             if (this.OnError(ConverterTestType.XmlnsMissing, element, "The xmlns attribute is missing.  It must be present with a value of '{0}'.", WixNamespace.NamespaceName))
             {
diff --git a/src/test/WixToolsetTest.Converters/ConverterFixture.cs b/src/test/WixToolsetTest.Converters/ConverterFixture.cs
index 97769cd6..71069333 100644
--- a/src/test/WixToolsetTest.Converters/ConverterFixture.cs
+++ b/src/test/WixToolsetTest.Converters/ConverterFixture.cs
@@ -364,7 +364,7 @@ namespace WixToolsetTest.Converters
         }
 
         [Fact]
-        public void CanConvertMissingNamespace()
+        public void CanConvertMissingWixNamespace()
         {
             var parse = String.Join(Environment.NewLine,
                 "<?xml version='1.0' encoding='utf-8'?>",
@@ -392,6 +392,35 @@ namespace WixToolsetTest.Converters
             Assert.Equal(Wix4Namespace, document.Root.GetDefaultNamespace());
         }
 
+        [Fact]
+        public void CanConvertMissingIncludeNamespace()
+        {
+            var parse = String.Join(Environment.NewLine,
+                "<?xml version='1.0' encoding='utf-8'?>",
+                "<Include>",
+                "  <?define Version = 1.2.3 ?>",
+                "</Include>");
+
+            var expected = String.Join(Environment.NewLine,
+                "<?xml version=\"1.0\" encoding=\"utf-16\"?>",
+                "<Include xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">",
+                "  <?define Version = 1.2.3 ?>",
+                "</Include>");
+
+            var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
+
+            var messaging = new DummyMessaging();
+            var converter = new Wix3Converter(messaging, 2, null, null);
+
+            var errors = converter.ConvertDocument(document);
+
+            var actual = UnformattedDocumentString(document);
+
+            Assert.Equal(1, errors);
+            Assert.Equal(expected, actual);
+            Assert.Equal(Wix4Namespace, document.Root.GetDefaultNamespace());
+        }
+
         [Fact]
         public void CanConvertAnonymousFile()
         {
-- 
cgit v1.2.3-55-g6feb