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_EmbeddedUI.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_EmbeddedUI.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler_EmbeddedUI.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Core/Compiler_EmbeddedUI.cs b/src/WixToolset.Core/Compiler_EmbeddedUI.cs index ca658962..ede03933 100644 --- a/src/WixToolset.Core/Compiler_EmbeddedUI.cs +++ b/src/WixToolset.Core/Compiler_EmbeddedUI.cs | |||
| @@ -80,8 +80,6 @@ namespace WixToolset.Core | |||
| 80 | } | 80 | } |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | this.Core.VerifyNoInnerText(sourceLineNumbers, node); | ||
| 84 | |||
| 85 | if (null == id) | 83 | if (null == id) |
| 86 | { | 84 | { |
| 87 | id = this.Core.CreateIdentifier("mec", source, type.ToString()); | 85 | id = this.Core.CreateIdentifier("mec", source, type.ToString()); |
| @@ -92,6 +90,8 @@ namespace WixToolset.Core | |||
| 92 | this.Core.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, node.Name.LocalName, "BinarySource", "FileSource", "PropertySource")); | 90 | this.Core.Write(ErrorMessages.ExpectedAttributes(sourceLineNumbers, node.Name.LocalName, "BinarySource", "FileSource", "PropertySource")); |
| 93 | } | 91 | } |
| 94 | 92 | ||
| 93 | this.Core.ParseForExtensionElements(node); | ||
| 94 | |||
| 95 | if (!this.Core.EncounteredError) | 95 | if (!this.Core.EncounteredError) |
| 96 | { | 96 | { |
| 97 | this.Core.AddSymbol(new MsiEmbeddedChainerSymbol(sourceLineNumbers, id) | 97 | this.Core.AddSymbol(new MsiEmbeddedChainerSymbol(sourceLineNumbers, id) |
