From 7a7f88c3009ad824852322682cc8cfd3173c2e02 Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Wed, 30 Sep 2020 18:56:06 -0400
Subject:  Add error message for cases where inner text used to be used.

---
 src/WixToolset.Core/Compiler_2.cs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'src/WixToolset.Core/Compiler_2.cs')

diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs
index 204a3788..fbad873e 100644
--- a/src/WixToolset.Core/Compiler_2.cs
+++ b/src/WixToolset.Core/Compiler_2.cs
@@ -1211,6 +1211,8 @@ namespace WixToolset.Core
                 }
             }
 
+            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
+
             if (null == sddl)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Sddl"));
@@ -1499,6 +1501,8 @@ 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);
@@ -2043,6 +2047,8 @@ namespace WixToolset.Core
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Value"));
             }
 
+            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
+
             this.Core.ParseForExtensionElements(node);
 
             return (null == value) ? multiStringValue : String.Concat(value, "[~]", multiStringValue);
@@ -2608,6 +2614,8 @@ namespace WixToolset.Core
                     }
                 }
 
+                this.Core.VerifyNoInnerText(childSourceLineNumbers, node);
+
                 if (customAction && "Custom" == actionName)
                 {
                     this.Core.Write(ErrorMessages.ExpectedAttribute(childSourceLineNumbers, child.Name.LocalName, "Action"));
@@ -3071,6 +3079,8 @@ namespace WixToolset.Core
                 }
             }
 
+            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
+
             if (privilege == null)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Name"));
@@ -3432,6 +3442,8 @@ namespace WixToolset.Core
                 }
             }
 
+            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
+
             if (argument == null)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Value"));
@@ -3769,6 +3781,8 @@ namespace WixToolset.Core
                 }
             }
 
+            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
+
             if (null == id)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
@@ -3876,6 +3890,8 @@ namespace WixToolset.Core
                 }
             }
 
+            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
+
             if (null == id)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
@@ -4353,6 +4369,8 @@ namespace WixToolset.Core
                 }
             }
 
+            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
+
             if (String.IsNullOrEmpty(key))
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Key"));
-- 
cgit v1.2.3-55-g6feb