diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-03-01 10:14:38 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-01 12:23:34 -0800 |
| commit | 3eb3c26c796984b64365fda077f173af8bf31559 (patch) | |
| tree | 0912d69363973bc8db704a18b1b4bcede6a84360 /src/WixToolset.Core/Compiler.cs | |
| parent | 697f2cdbdcd8198d06ebf14fc2b65f0ce3fa5a94 (diff) | |
| download | wix-3eb3c26c796984b64365fda077f173af8bf31559.tar.gz wix-3eb3c26c796984b64365fda077f173af8bf31559.tar.bz2 wix-3eb3c26c796984b64365fda077f173af8bf31559.zip | |
Fix handling of suppress modularization
Partially fixes wixtoolset/issues#5944
Diffstat (limited to 'src/WixToolset.Core/Compiler.cs')
| -rw-r--r-- | src/WixToolset.Core/Compiler.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 384f8795..7113c3b5 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
| @@ -728,14 +728,17 @@ namespace WixToolset.Core | |||
| 728 | 728 | ||
| 729 | if (!this.Core.EncounteredError) | 729 | if (!this.Core.EncounteredError) |
| 730 | { | 730 | { |
| 731 | var symbol = this.Core.AddSymbol(new BinarySymbol(sourceLineNumbers, id) | 731 | this.Core.AddSymbol(new BinarySymbol(sourceLineNumbers, id) |
| 732 | { | 732 | { |
| 733 | Data = new IntermediateFieldPathValue { Path = sourceFile } | 733 | Data = new IntermediateFieldPathValue { Path = sourceFile } |
| 734 | }); | 734 | }); |
| 735 | 735 | ||
| 736 | if (YesNoType.Yes == suppressModularization) | 736 | if (YesNoType.Yes == suppressModularization) |
| 737 | { | 737 | { |
| 738 | this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers, id)); | 738 | this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers) |
| 739 | { | ||
| 740 | SuppressIdentifier = id.Id | ||
| 741 | }); | ||
| 739 | } | 742 | } |
| 740 | } | 743 | } |
| 741 | 744 | ||
| @@ -3502,7 +3505,10 @@ namespace WixToolset.Core | |||
| 3502 | 3505 | ||
| 3503 | if (YesNoType.Yes == suppressModularization) | 3506 | if (YesNoType.Yes == suppressModularization) |
| 3504 | { | 3507 | { |
| 3505 | this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers, id)); | 3508 | this.Core.AddSymbol(new WixSuppressModularizationSymbol(sourceLineNumbers) |
| 3509 | { | ||
| 3510 | SuppressIdentifier = id.Id | ||
| 3511 | }); | ||
| 3506 | } | 3512 | } |
| 3507 | } | 3513 | } |
| 3508 | } | 3514 | } |
