diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-10-25 11:20:31 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-10-31 10:57:14 -0700 |
| commit | 033f38a28c89945ce4379f5992e8f36943a125ab (patch) | |
| tree | 7feb7700b4bca1c0cff5bdb85af5e2d543e226c2 /src/api | |
| parent | 217182f85fa737d20fb5846f395cabfa599bf1c6 (diff) | |
| download | wix-033f38a28c89945ce4379f5992e8f36943a125ab.tar.gz wix-033f38a28c89945ce4379f5992e8f36943a125ab.tar.bz2 wix-033f38a28c89945ce4379f5992e8f36943a125ab.zip | |
Loc files were still using inner text, stop doing that
Fixes 6970
Diffstat (limited to 'src/api')
| -rw-r--r-- | src/api/wix/WixToolset.Data/ErrorMessages.cs | 5 | ||||
| -rw-r--r-- | src/api/wix/WixToolset.Extensibility/Services/IParseHelper.cs | 7 |
2 files changed, 12 insertions, 0 deletions
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 | |||
| 2271 | return Message(sourceLineNumbers, Ids.IllegalInnerText, "The {0} element contains illegal inner text: '{1}'.", elementName, innerText); | 2271 | return Message(sourceLineNumbers, Ids.IllegalInnerText, "The {0} element contains illegal inner text: '{1}'.", elementName, innerText); |
| 2272 | } | 2272 | } |
| 2273 | 2273 | ||
| 2274 | public static Message IllegalInnerText(SourceLineNumber sourceLineNumbers, string elementName, string innerText, string attributeName) | ||
| 2275 | { | ||
| 2276 | return Message(sourceLineNumbers, Ids.IllegalInnerText, "The {0} element contains inner text which is obsolete. Use the {1} attribute instead.", elementName, attributeName); | ||
| 2277 | } | ||
| 2278 | |||
| 2274 | private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) | 2279 | private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) |
| 2275 | { | 2280 | { |
| 2276 | return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args); | 2281 | 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 | |||
| @@ -369,6 +369,13 @@ namespace WixToolset.Extensibility.Services | |||
| 369 | void InnerTextDisallowed(XElement element); | 369 | void InnerTextDisallowed(XElement element); |
| 370 | 370 | ||
| 371 | /// <summary> | 371 | /// <summary> |
| 372 | /// Validates that the element does not contain inner text and suggests which attribute to use instead. | ||
| 373 | /// </summary> | ||
| 374 | /// <param name="element">Element to check for inner text.</param> | ||
| 375 | /// <param name="attributeName">Name of attribute to use instead of inner text.</param> | ||
| 376 | void InnerTextDisallowed(XElement element, string attributeName); | ||
| 377 | |||
| 378 | /// <summary> | ||
| 372 | /// Verifies that a value is a legal identifier. | 379 | /// Verifies that a value is a legal identifier. |
| 373 | /// </summary> | 380 | /// </summary> |
| 374 | /// <param name="value">The value to verify.</param> | 381 | /// <param name="value">The value to verify.</param> |
