diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-11-09 15:48:37 -0500 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-11-09 15:54:55 -0500 |
| commit | af854e4c8341cc90fb41c8b5122d4308574e8a9a (patch) | |
| tree | 87d7986c65bebbd4da1835059398f39dcb20d5f8 /src/WixToolset.Core/Compiler_PatchCreation.cs | |
| parent | ae38ae001422b6925e3d214334fd64cfba526952 (diff) | |
| download | wix-af854e4c8341cc90fb41c8b5122d4308574e8a9a.tar.gz wix-af854e4c8341cc90fb41c8b5122d4308574e8a9a.tar.bz2 wix-af854e4c8341cc90fb41c8b5122d4308574e8a9a.zip | |
Obsolete long-deprecated elements and attributes.
Diffstat (limited to 'src/WixToolset.Core/Compiler_PatchCreation.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler_PatchCreation.cs | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/src/WixToolset.Core/Compiler_PatchCreation.cs b/src/WixToolset.Core/Compiler_PatchCreation.cs index ddd07654..c1c593c2 100644 --- a/src/WixToolset.Core/Compiler_PatchCreation.cs +++ b/src/WixToolset.Core/Compiler_PatchCreation.cs | |||
| @@ -305,29 +305,9 @@ namespace WixToolset.Core | |||
| 305 | } | 305 | } |
| 306 | break; | 306 | break; |
| 307 | case "SourceFile": | 307 | case "SourceFile": |
| 308 | case "src": | ||
| 309 | if (null != sourceFile) | ||
| 310 | { | ||
| 311 | this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "src", "SourceFile")); | ||
| 312 | } | ||
| 313 | |||
| 314 | if ("src" == attrib.Name.LocalName) | ||
| 315 | { | ||
| 316 | this.Core.Write(WarningMessages.DeprecatedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "SourceFile")); | ||
| 317 | } | ||
| 318 | sourceFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); | 308 | sourceFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); |
| 319 | break; | 309 | break; |
| 320 | case "SourcePatch": | 310 | case "SourcePatch": |
| 321 | case "srcPatch": | ||
| 322 | if (null != sourcePatch) | ||
| 323 | { | ||
| 324 | this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "srcPatch", "SourcePatch")); | ||
| 325 | } | ||
| 326 | |||
| 327 | if ("srcPatch" == attrib.Name.LocalName) | ||
| 328 | { | ||
| 329 | this.Core.Write(WarningMessages.DeprecatedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "SourcePatch")); | ||
| 330 | } | ||
| 331 | sourcePatch = this.Core.GetAttributeValue(sourceLineNumbers, attrib); | 311 | sourcePatch = this.Core.GetAttributeValue(sourceLineNumbers, attrib); |
| 332 | break; | 312 | break; |
| 333 | default: | 313 | default: |
| @@ -518,16 +498,6 @@ namespace WixToolset.Core | |||
| 518 | order = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, Int32.MinValue + 2, Int32.MaxValue); | 498 | order = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, Int32.MinValue + 2, Int32.MaxValue); |
| 519 | break; | 499 | break; |
| 520 | case "SourceFile": | 500 | case "SourceFile": |
| 521 | case "src": | ||
| 522 | if (null != sourceFile) | ||
| 523 | { | ||
| 524 | this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "src", "SourceFile")); | ||
| 525 | } | ||
| 526 | |||
| 527 | if ("src" == attrib.Name.LocalName) | ||
| 528 | { | ||
| 529 | this.Core.Write(WarningMessages.DeprecatedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "SourceFile")); | ||
| 530 | } | ||
| 531 | sourceFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); | 501 | sourceFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); |
| 532 | break; | 502 | break; |
| 533 | case "Validation": | 503 | case "Validation": |
| @@ -727,16 +697,6 @@ namespace WixToolset.Core | |||
| 727 | order = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, Int32.MinValue + 2, Int32.MaxValue); | 697 | order = this.Core.GetAttributeIntegerValue(sourceLineNumbers, attrib, Int32.MinValue + 2, Int32.MaxValue); |
| 728 | break; | 698 | break; |
| 729 | case "Source": | 699 | case "Source": |
| 730 | case "src": | ||
| 731 | if (null != source) | ||
| 732 | { | ||
| 733 | this.Core.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, node.Name.LocalName, "src", "Source")); | ||
| 734 | } | ||
| 735 | |||
| 736 | if ("src" == attrib.Name.LocalName) | ||
| 737 | { | ||
| 738 | this.Core.Write(WarningMessages.DeprecatedAttribute(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, "Source")); | ||
| 739 | } | ||
| 740 | source = this.Core.GetAttributeValue(sourceLineNumbers, attrib); | 700 | source = this.Core.GetAttributeValue(sourceLineNumbers, attrib); |
| 741 | break; | 701 | break; |
| 742 | default: | 702 | default: |
