From efcc52fdd0d767d45497ebf54765ad6da7878c6f Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@joyofsetup.com>
Date: Mon, 4 Nov 2019 15:02:01 -0500
Subject: When fixing namespaceless elements, fix the whole tree.

---
 src/WixToolset.Converters/Wix3Converter.cs             | 2 +-
 src/test/WixToolsetTest.Converters/ConverterFixture.cs | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/WixToolset.Converters/Wix3Converter.cs b/src/WixToolset.Converters/Wix3Converter.cs
index b4ce1064..faff12ee 100644
--- a/src/WixToolset.Converters/Wix3Converter.cs
+++ b/src/WixToolset.Converters/Wix3Converter.cs
@@ -422,7 +422,7 @@ namespace WixToolset.Converters
 
             element.Add(new XAttribute("xmlns", WixNamespace.NamespaceName)); // set the default namespace.
 
-            foreach (var elementWithoutNamespace in element.Elements().Where(e => XNamespace.None == e.Name.Namespace))
+            foreach (var elementWithoutNamespace in element.DescendantsAndSelf().Where(e => XNamespace.None == e.Name.Namespace))
             {
                 elementWithoutNamespace.Name = WixNamespace.GetName(elementWithoutNamespace.Name.LocalName);
             }
diff --git a/src/test/WixToolsetTest.Converters/ConverterFixture.cs b/src/test/WixToolsetTest.Converters/ConverterFixture.cs
index e2c0be5b..fd35ae50 100644
--- a/src/test/WixToolsetTest.Converters/ConverterFixture.cs
+++ b/src/test/WixToolsetTest.Converters/ConverterFixture.cs
@@ -399,12 +399,18 @@ namespace WixToolsetTest.Converters
                 "<?xml version='1.0' encoding='utf-8'?>",
                 "<Include>",
                 "  <?define Version = 1.2.3 ?>",
+                "  <Fragment>",
+                "    <DirectoryRef Id='TARGETDIR' />",
+                "  </Fragment>",
                 "</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 ?>",
+                "  <Fragment>",
+                "    <DirectoryRef Id=\"TARGETDIR\" />",
+                "  </Fragment>",
                 "</Include>");
 
             var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
-- 
cgit v1.2.3-55-g6feb