From 033f38a28c89945ce4379f5992e8f36943a125ab Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Tue, 25 Oct 2022 11:20:31 -0700
Subject: Loc files were still using inner text, stop doing that

Fixes 6970
---
 src/api/wix/WixToolset.Data/ErrorMessages.cs                  | 5 +++++
 src/api/wix/WixToolset.Extensibility/Services/IParseHelper.cs | 7 +++++++
 2 files changed, 12 insertions(+)

(limited to 'src/api')

diff --git a/src/api/wix/WixToolset.Data/ErrorMessages.cs b/src/api/wix/WixToolset.Data/ErrorMessages.cs
index 77ce73aa..fcf377e3 100644
--- a/src/api/wix/WixToolset.Data/ErrorMessages.cs
+++ b/src/api/wix/WixToolset.Data/ErrorMessages.cs
@@ -2271,6 +2271,11 @@ namespace WixToolset.Data
             return Message(sourceLineNumbers, Ids.IllegalInnerText, "The {0} element contains illegal inner text: '{1}'.", elementName, innerText);
         }
 
+        public static Message IllegalInnerText(SourceLineNumber sourceLineNumbers, string elementName, string innerText, string attributeName)
+        {
+            return Message(sourceLineNumbers, Ids.IllegalInnerText, "The {0} element contains inner text which is obsolete. Use the {1} attribute instead.", elementName, attributeName);
+        }
+
         private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args)
         {
             return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args);
diff --git a/src/api/wix/WixToolset.Extensibility/Services/IParseHelper.cs b/src/api/wix/WixToolset.Extensibility/Services/IParseHelper.cs
index 3a3c2ceb..567b623c 100644
--- a/src/api/wix/WixToolset.Extensibility/Services/IParseHelper.cs
+++ b/src/api/wix/WixToolset.Extensibility/Services/IParseHelper.cs
@@ -368,6 +368,13 @@ namespace WixToolset.Extensibility.Services
         /// <param name="element">Element to check for inner text.</param>
         void InnerTextDisallowed(XElement element);
 
+        /// <summary>
+        /// Validates that the element does not contain inner text and suggests which attribute to use instead.
+        /// </summary>
+        /// <param name="element">Element to check for inner text.</param>
+        /// <param name="attributeName">Name of attribute to use instead of inner text.</param>
+        void InnerTextDisallowed(XElement element, string attributeName);
+
         /// <summary>
         /// Verifies that a value is a legal identifier.
         /// </summary>
-- 
cgit v1.2.3-55-g6feb