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.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.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 286a598b..d9c60ef6 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
| @@ -3382,6 +3382,8 @@ namespace WixToolset.Core | |||
| 3382 | win64 = true; | 3382 | win64 = true; |
| 3383 | } | 3383 | } |
| 3384 | 3384 | ||
| 3385 | this.Core.VerifyNoInnerText(sourceLineNumbers, node); | ||
| 3386 | |||
| 3385 | // if we have an in-lined Script CustomAction ensure no source or target attributes were provided | 3387 | // if we have an in-lined Script CustomAction ensure no source or target attributes were provided |
| 3386 | if (inlineScript) | 3388 | if (inlineScript) |
| 3387 | { | 3389 | { |
| @@ -5349,6 +5351,8 @@ namespace WixToolset.Core | |||
| 5349 | } | 5351 | } |
| 5350 | } | 5352 | } |
| 5351 | 5353 | ||
| 5354 | this.Core.VerifyNoInnerText(sourceLineNumbers, node); | ||
| 5355 | |||
| 5352 | if (CompilerConstants.IntegerNotSet == id) | 5356 | if (CompilerConstants.IntegerNotSet == id) |
| 5353 | { | 5357 | { |
| 5354 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id")); | 5358 | this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id")); |
| @@ -7598,7 +7602,7 @@ namespace WixToolset.Core | |||
| 7598 | } | 7602 | } |
| 7599 | 7603 | ||
| 7600 | /// <summary> | 7604 | /// <summary> |
| 7601 | /// Parses a condition element. | 7605 | /// Parses a Level element. |
| 7602 | /// </summary> | 7606 | /// </summary> |
| 7603 | /// <param name="node">Element to parse.</param> | 7607 | /// <param name="node">Element to parse.</param> |
| 7604 | /// <param name="featureId">Id of the parent Feature element.</param> | 7608 | /// <param name="featureId">Id of the parent Feature element.</param> |
