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_UI.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/src/WixToolset.Core/Compiler_UI.cs b/src/WixToolset.Core/Compiler_UI.cs
index 9353d966..cb1d34ac 100644
--- a/src/WixToolset.Core/Compiler_UI.cs
+++ b/src/WixToolset.Core/Compiler_UI.cs
@@ -700,6 +700,8 @@ namespace WixToolset.Core
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Action"));
             }
 
+            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
+
             this.Core.ParseForExtensionElements(node);
 
             if (!this.Core.EncounteredError)
@@ -746,6 +748,8 @@ namespace WixToolset.Core
                 }
             }
 
+            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
+
             if (null == id)
             {
                 id = this.Core.CreateIdentifier("txt", text);
@@ -1422,6 +1426,8 @@ namespace WixToolset.Core
                             }
                         }
 
+                        this.Core.VerifyNoInnerText(sourceLineNumbers, node);
+
                         if (!String.IsNullOrEmpty(text) && null != sourceFile)
                         {
                             this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(childSourceLineNumbers, child.Name.LocalName, "SourceFile", "Value"));
@@ -1689,6 +1695,8 @@ namespace WixToolset.Core
                 }
             }
 
+            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
+
             if (null == control)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Control"));
-- 
cgit v1.2.3-55-g6feb