1 files changed, 4 insertions, 18 deletions

diff --git a/src/WixToolset.Core/Compiler_Package.cs b/src/WixToolset.Core/Compiler_Package.cs
index 1dac5399..dfd7d9e4 100644
--- a/src/WixToolset.Core/Compiler_Package.cs
+++ b/src/WixToolset.Core/Compiler_Package.cs
@@ -1157,8 +1157,6 @@ namespace WixToolset.Core
                 }
             }
 
-            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
-
             if (null == sddl)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Sddl"));
@@ -1447,8 +1445,6 @@ namespace WixToolset.Core
                 this.Core.Write(ErrorMessages.CannotAuthorSpecialProperties(sourceLineNumbers, id.Id));
             }
 
-            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
-
             if ("ErrorDialog" == id.Id)
             {
                 this.Core.CreateSimpleReference(sourceLineNumbers, SymbolDefinitions.Dialog, value);
@@ -1473,6 +1469,8 @@ namespace WixToolset.Core
                 }
             }
 
+            this.Core.InnerTextDisallowed(node);
+
             // see if this property is used for appSearch
             var signatures = this.ParseSearchSignatures(node);
 
@@ -1986,8 +1984,6 @@ namespace WixToolset.Core
                 }
             }
 
-            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
-
             this.Core.ParseForExtensionElements(node);
 
             return null == value ? multiStringValue ?? "[~]" : String.Concat(value, "[~]", multiStringValue);
@@ -2547,8 +2543,6 @@ namespace WixToolset.Core
                     }
                 }
 
-                this.Core.VerifyNoInnerText(childSourceLineNumbers, node);
-
                 if (customAction && "Custom" == actionName)
                 {
                     this.Core.Write(ErrorMessages.ExpectedAttribute(childSourceLineNumbers, child.Name.LocalName, "Action"));
@@ -2637,6 +2631,8 @@ namespace WixToolset.Core
                     }
                 }
             }
+
+            this.Core.InnerTextDisallowed(node);
         }
 
 
@@ -3012,8 +3008,6 @@ namespace WixToolset.Core
                 }
             }
 
-            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
-
             if (privilege == null)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Name"));
@@ -3375,8 +3369,6 @@ namespace WixToolset.Core
                 }
             }
 
-            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
-
             if (argument == null)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Value"));
@@ -3715,8 +3707,6 @@ namespace WixToolset.Core
                 }
             }
 
-            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
-
             if (null == id)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
@@ -3824,8 +3814,6 @@ namespace WixToolset.Core
                 }
             }
 
-            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
-
             if (null == id)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
@@ -4304,8 +4292,6 @@ namespace WixToolset.Core
                 }
             }
 
-            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
-
             if (String.IsNullOrEmpty(key))
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Key"));