1 files changed, 33 insertions, 4 deletions

diff --git a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
index 8e9f48c4..a9a0fa9d 100644
--- a/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
+++ b/src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs
@@ -6,6 +6,8 @@ namespace WixToolset.Core.ExtensibilityServices
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.Globalization;
+    using System.Linq;
+    using System.Xml;
     using System.Xml.Linq;
     using WixToolset.Data;
     using WixToolset.Data.Symbols;
@@ -642,6 +644,19 @@ namespace WixToolset.Core.ExtensibilityServices
             return value?.Trim();
         }
 
+        public void InnerTextDisallowed(XElement element)
+        {
+            if (element.Nodes().Any(n => XmlNodeType.Text == n.NodeType || XmlNodeType.CDATA == n.NodeType))
+            {
+                var innerText = Common.GetInnerText(element);
+                if (!String.IsNullOrWhiteSpace(innerText))
+                {
+                    var sourceLineNumbers = this.GetSourceLineNumbers(element);
+                    this.Messaging.Write(ErrorMessages.IllegalInnerText(sourceLineNumbers, element.Name.LocalName, innerText));
+                }
+            }
+        }
+
         public bool IsValidIdentifier(string value)
         {
             return Common.IsIdentifier(value);
@@ -714,17 +729,31 @@ namespace WixToolset.Core.ExtensibilityServices
 
         public void ParseForExtensionElements(IEnumerable<ICompilerExtension> extensions, Intermediate intermediate, IntermediateSection section, XElement element)
         {
-            foreach (var child in element.Elements())
+            var checkInnerText = false;
+
+            foreach (var child in element.Nodes())
             {
-                if (element.Name.Namespace == child.Name.Namespace)
+                if (child is XElement childElement)
                 {
-                    this.UnexpectedElement(element, child);
+                    if (element.Name.Namespace == childElement.Name.Namespace)
+                    {
+                        this.UnexpectedElement(element, childElement);
+                    }
+                    else
+                    {
+                        this.ParseExtensionElement(extensions, intermediate, section, element, childElement);
+                    }
                 }
                 else
                 {
-                    this.ParseExtensionElement(extensions, intermediate, section, element, child);
+                    checkInnerText = true;
                 }
             }
+
+            if (checkInnerText)
+            {
+                this.InnerTextDisallowed(element);
+            }
         }
 
         public WixActionSymbol ScheduleActionSymbol(IntermediateSection section, SourceLineNumber sourceLineNumbers, AccessModifier access, SequenceTable sequence, string actionName, string condition, string beforeAction, string afterAction, bool overridable = false)