diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-03-16 14:48:48 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-16 16:16:02 -0700 |
| commit | 0b3381007cb201d5ee28aa80990cd14a1c376f18 (patch) | |
| tree | edf6910d3fa14c6a19d2c4490fa4b94739b9c4de /src/WixToolset.Core/Compiler.cs | |
| parent | 0d4df529a7e34f033112a1c6f16f749880334e7d (diff) | |
| download | wix-0b3381007cb201d5ee28aa80990cd14a1c376f18.tar.gz wix-0b3381007cb201d5ee28aa80990cd14a1c376f18.tar.bz2 wix-0b3381007cb201d5ee28aa80990cd14a1c376f18.zip | |
Centralize disallow inner text handling in ParseHalper
Fixes wixtoolset/issues#6237
Diffstat (limited to 'src/WixToolset.Core/Compiler.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler.cs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 22f0df8f..d751dde0 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
| @@ -3399,8 +3399,6 @@ namespace WixToolset.Core | |||
| 3399 | win64 = true; | 3399 | win64 = true; |
| 3400 | } | 3400 | } |
| 3401 | 3401 | ||
| 3402 | this.Core.VerifyNoInnerText(sourceLineNumbers, node); | ||
| 3403 | |||
| 3404 | // if we have an in-lined Script CustomAction ensure no source or target attributes were provided | 3402 | // if we have an in-lined Script CustomAction ensure no source or target attributes were provided |
| 3405 | if (inlineScript) | 3403 | if (inlineScript) |
| 3406 | { | 3404 | { |
| @@ -4125,7 +4123,7 @@ namespace WixToolset.Core | |||
| 4125 | } | 4123 | } |
| 4126 | } | 4124 | } |
| 4127 | 4125 | ||
| 4128 | this.Core.VerifyNoInnerText(sourceLineNumbers, node); | 4126 | this.Core.InnerTextDisallowed(node); |
| 4129 | 4127 | ||
| 4130 | if (null == columnName) | 4128 | if (null == columnName) |
| 4131 | { | 4129 | { |
| @@ -5365,8 +5363,6 @@ namespace WixToolset.Core | |||
| 5365 | } | 5363 | } |
| 5366 | } | 5364 | } |
| 5367 | 5365 | ||
| 5368 | this.Core.VerifyNoInnerText(sourceLineNumbers, node); | ||
| 5369 | |||
| 5370 | if (CompilerConstants.IntegerNotSet == id) | 5366 | if (CompilerConstants.IntegerNotSet == id) |
| 5371 | { | 5367 | { |
| 5372 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id")); | 5368 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id")); |
