diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-09-30 18:56:06 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-09-30 19:09:37 -0400 |
| commit | 7a7f88c3009ad824852322682cc8cfd3173c2e02 (patch) | |
| tree | 98c980444bb1a51297e4eae01171565b02d4ce75 /src/WixToolset.Core/Compiler_UI.cs | |
| parent | 27124207afa517da564cdce557dd21654f1a9078 (diff) | |
| download | wix-7a7f88c3009ad824852322682cc8cfd3173c2e02.tar.gz wix-7a7f88c3009ad824852322682cc8cfd3173c2e02.tar.bz2 wix-7a7f88c3009ad824852322682cc8cfd3173c2e02.zip | |
Add error message for cases where inner text used to be used.
Diffstat (limited to 'src/WixToolset.Core/Compiler_UI.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler_UI.cs | 8 |
1 files changed, 8 insertions, 0 deletions
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 | |||
| 700 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Action")); | 700 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Action")); |
| 701 | } | 701 | } |
| 702 | 702 | ||
| 703 | this.Core.VerifyNoInnerText(sourceLineNumbers, node); | ||
| 704 | |||
| 703 | this.Core.ParseForExtensionElements(node); | 705 | this.Core.ParseForExtensionElements(node); |
| 704 | 706 | ||
| 705 | if (!this.Core.EncounteredError) | 707 | if (!this.Core.EncounteredError) |
| @@ -746,6 +748,8 @@ namespace WixToolset.Core | |||
| 746 | } | 748 | } |
| 747 | } | 749 | } |
| 748 | 750 | ||
| 751 | this.Core.VerifyNoInnerText(sourceLineNumbers, node); | ||
| 752 | |||
| 749 | if (null == id) | 753 | if (null == id) |
| 750 | { | 754 | { |
| 751 | id = this.Core.CreateIdentifier("txt", text); | 755 | id = this.Core.CreateIdentifier("txt", text); |
| @@ -1422,6 +1426,8 @@ namespace WixToolset.Core | |||
| 1422 | } | 1426 | } |
| 1423 | } | 1427 | } |
| 1424 | 1428 | ||
| 1429 | this.Core.VerifyNoInnerText(sourceLineNumbers, node); | ||
| 1430 | |||
| 1425 | if (!String.IsNullOrEmpty(text) && null != sourceFile) | 1431 | if (!String.IsNullOrEmpty(text) && null != sourceFile) |
| 1426 | { | 1432 | { |
| 1427 | this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(childSourceLineNumbers, child.Name.LocalName, "SourceFile", "Value")); | 1433 | this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(childSourceLineNumbers, child.Name.LocalName, "SourceFile", "Value")); |
| @@ -1689,6 +1695,8 @@ namespace WixToolset.Core | |||
| 1689 | } | 1695 | } |
| 1690 | } | 1696 | } |
| 1691 | 1697 | ||
| 1698 | this.Core.VerifyNoInnerText(sourceLineNumbers, node); | ||
| 1699 | |||
| 1692 | if (null == control) | 1700 | if (null == control) |
| 1693 | { | 1701 | { |
| 1694 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Control")); | 1702 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Control")); |
