diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-02-28 23:01:08 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-01 12:18:32 -0800 |
| commit | c0b3e09c76e4de4e81af9d41bb1170dd8bd20d6d (patch) | |
| tree | f89361bf2ae0411cf2341c029df3ed1b4937fe6c | |
| parent | 55252821d8effa420f95d10824f59d5e176a43b3 (diff) | |
| download | wix-c0b3e09c76e4de4e81af9d41bb1170dd8bd20d6d.tar.gz wix-c0b3e09c76e4de4e81af9d41bb1170dd8bd20d6d.tar.bz2 wix-c0b3e09c76e4de4e81af9d41bb1170dd8bd20d6d.zip | |
Move suppress modularization to field since Id can create conflicts
Partially fixes wixtoolset/issues#5944
| -rw-r--r-- | src/WixToolset.Data/Symbols/WixSuppressModularizationSymbol.cs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/WixToolset.Data/Symbols/WixSuppressModularizationSymbol.cs b/src/WixToolset.Data/Symbols/WixSuppressModularizationSymbol.cs index 1bdffd5e..dca86820 100644 --- a/src/WixToolset.Data/Symbols/WixSuppressModularizationSymbol.cs +++ b/src/WixToolset.Data/Symbols/WixSuppressModularizationSymbol.cs | |||
| @@ -10,6 +10,7 @@ namespace WixToolset.Data | |||
| 10 | SymbolDefinitionType.WixSuppressModularization, | 10 | SymbolDefinitionType.WixSuppressModularization, |
| 11 | new IntermediateFieldDefinition[] | 11 | new IntermediateFieldDefinition[] |
| 12 | { | 12 | { |
| 13 | new IntermediateFieldDefinition(nameof(WixSuppressModularizationSymbolFields.SuppressIdentifier), IntermediateFieldType.String), | ||
| 13 | }, | 14 | }, |
| 14 | typeof(WixSuppressModularizationSymbol)); | 15 | typeof(WixSuppressModularizationSymbol)); |
| 15 | } | 16 | } |
| @@ -19,6 +20,7 @@ namespace WixToolset.Data.Symbols | |||
| 19 | { | 20 | { |
| 20 | public enum WixSuppressModularizationSymbolFields | 21 | public enum WixSuppressModularizationSymbolFields |
| 21 | { | 22 | { |
| 23 | SuppressIdentifier, | ||
| 22 | } | 24 | } |
| 23 | 25 | ||
| 24 | public class WixSuppressModularizationSymbol : IntermediateSymbol | 26 | public class WixSuppressModularizationSymbol : IntermediateSymbol |
| @@ -31,6 +33,12 @@ namespace WixToolset.Data.Symbols | |||
| 31 | { | 33 | { |
| 32 | } | 34 | } |
| 33 | 35 | ||
| 36 | public string SuppressIdentifier | ||
| 37 | { | ||
| 38 | get => (string)this.Fields[(int)WixSuppressModularizationSymbolFields.SuppressIdentifier]; | ||
| 39 | set => this.Set((int)WixSuppressModularizationSymbolFields.SuppressIdentifier, value); | ||
| 40 | } | ||
| 41 | |||
| 34 | public IntermediateField this[WixSuppressModularizationSymbolFields index] => this.Fields[(int)index]; | 42 | public IntermediateField this[WixSuppressModularizationSymbolFields index] => this.Fields[(int)index]; |
| 35 | } | 43 | } |
| 36 | } \ No newline at end of file | 44 | } |
