diff options
| author | Rob Mensching <rob@firegiant.com> | 2023-02-09 05:12:55 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2023-02-09 15:18:09 -0800 |
| commit | a4c49ddc3baf4ebf7a6c40f2d3c10e2e6e3632db (patch) | |
| tree | 837972845c9471c1ea050c8cbee4537fdaed0096 | |
| parent | dc8a7f2398602f994c3e43a733aa09b18dbd7662 (diff) | |
| download | wix-a4c49ddc3baf4ebf7a6c40f2d3c10e2e6e3632db.tar.gz wix-a4c49ddc3baf4ebf7a6c40f2d3c10e2e6e3632db.tar.bz2 wix-a4c49ddc3baf4ebf7a6c40f2d3c10e2e6e3632db.zip | |
Fix ComponentGroupSymbol fields
4 files changed, 25 insertions, 8 deletions
diff --git a/src/api/wix/WixToolset.Data/Symbols/WixComponentGroupSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/WixComponentGroupSymbol.cs index 4dd5a3b5..e000864f 100644 --- a/src/api/wix/WixToolset.Data/Symbols/WixComponentGroupSymbol.cs +++ b/src/api/wix/WixToolset.Data/Symbols/WixComponentGroupSymbol.cs | |||
| @@ -10,7 +10,8 @@ namespace WixToolset.Data | |||
| 10 | SymbolDefinitionType.WixComponentGroup, | 10 | SymbolDefinitionType.WixComponentGroup, |
| 11 | new[] | 11 | new[] |
| 12 | { | 12 | { |
| 13 | new IntermediateFieldDefinition(nameof(WixComponentGroupSymbolFields.WixComponentGroup), IntermediateFieldType.String), | 13 | new IntermediateFieldDefinition(nameof(WixComponentGroupSymbolFields.DirectoryRef), IntermediateFieldType.String), |
| 14 | new IntermediateFieldDefinition(nameof(WixComponentGroupSymbolFields.Source), IntermediateFieldType.String), | ||
| 14 | }, | 15 | }, |
| 15 | typeof(WixComponentGroupSymbol)); | 16 | typeof(WixComponentGroupSymbol)); |
| 16 | } | 17 | } |
| @@ -20,7 +21,8 @@ namespace WixToolset.Data.Symbols | |||
| 20 | { | 21 | { |
| 21 | public enum WixComponentGroupSymbolFields | 22 | public enum WixComponentGroupSymbolFields |
| 22 | { | 23 | { |
| 23 | WixComponentGroup, | 24 | DirectoryRef, |
| 25 | Source, | ||
| 24 | } | 26 | } |
| 25 | 27 | ||
| 26 | public class WixComponentGroupSymbol : IntermediateSymbol | 28 | public class WixComponentGroupSymbol : IntermediateSymbol |
| @@ -35,10 +37,16 @@ namespace WixToolset.Data.Symbols | |||
| 35 | 37 | ||
| 36 | public IntermediateField this[WixComponentGroupSymbolFields index] => this.Fields[(int)index]; | 38 | public IntermediateField this[WixComponentGroupSymbolFields index] => this.Fields[(int)index]; |
| 37 | 39 | ||
| 38 | public string WixComponentGroup | 40 | public string DirectoryRef |
| 39 | { | 41 | { |
| 40 | get => (string)this.Fields[(int)WixComponentGroupSymbolFields.WixComponentGroup]; | 42 | get => (string)this.Fields[(int)WixComponentGroupSymbolFields.DirectoryRef]; |
| 41 | set => this.Set((int)WixComponentGroupSymbolFields.WixComponentGroup, value); | 43 | set => this.Set((int)WixComponentGroupSymbolFields.DirectoryRef, value); |
| 44 | } | ||
| 45 | |||
| 46 | public string Source | ||
| 47 | { | ||
| 48 | get => (string)this.Fields[(int)WixComponentGroupSymbolFields.Source]; | ||
| 49 | set => this.Set((int)WixComponentGroupSymbolFields.Source, value); | ||
| 42 | } | 50 | } |
| 43 | } | 51 | } |
| 44 | } \ No newline at end of file | 52 | } |
diff --git a/src/wix/WixToolset.Converters.Symbolizer/ConvertSymbols.cs b/src/wix/WixToolset.Converters.Symbolizer/ConvertSymbols.cs index 0c862363..6e6f212d 100644 --- a/src/wix/WixToolset.Converters.Symbolizer/ConvertSymbols.cs +++ b/src/wix/WixToolset.Converters.Symbolizer/ConvertSymbols.cs | |||
| @@ -593,6 +593,8 @@ namespace WixToolset.Converters.Symbolizer | |||
| 593 | return DefaultSymbolFromRow(typeof(WixBundleVariableSymbol), row, columnZeroIsId: true); | 593 | return DefaultSymbolFromRow(typeof(WixBundleVariableSymbol), row, columnZeroIsId: true); |
| 594 | case "WixChainItem": | 594 | case "WixChainItem": |
| 595 | return DefaultSymbolFromRow(typeof(WixChainItemSymbol), row, columnZeroIsId: true); | 595 | return DefaultSymbolFromRow(typeof(WixChainItemSymbol), row, columnZeroIsId: true); |
| 596 | case "WixComponentGroup": | ||
| 597 | return DefaultSymbolFromRow(typeof(WixComponentGroupSymbol), row, columnZeroIsId: true); | ||
| 596 | case "WixCustomTable": | 598 | case "WixCustomTable": |
| 597 | return DefaultSymbolFromRow(typeof(WixCustomTableSymbol), row, columnZeroIsId: true); | 599 | return DefaultSymbolFromRow(typeof(WixCustomTableSymbol), row, columnZeroIsId: true); |
| 598 | case "WixDirectory": | 600 | case "WixDirectory": |
diff --git a/src/wix/WixToolset.Core/Compiler.cs b/src/wix/WixToolset.Core/Compiler.cs index fa53b4d0..4a501bc4 100644 --- a/src/wix/WixToolset.Core/Compiler.cs +++ b/src/wix/WixToolset.Core/Compiler.cs | |||
| @@ -2644,9 +2644,12 @@ namespace WixToolset.Core | |||
| 2644 | 2644 | ||
| 2645 | if (!this.Core.EncounteredError) | 2645 | if (!this.Core.EncounteredError) |
| 2646 | { | 2646 | { |
| 2647 | this.Core.AddSymbol(new WixComponentGroupSymbol(sourceLineNumbers, id)); | 2647 | this.Core.AddSymbol(new WixComponentGroupSymbol(sourceLineNumbers, id) |
| 2648 | { | ||
| 2649 | DirectoryRef = directoryId, | ||
| 2650 | Source = source | ||
| 2651 | }); | ||
| 2648 | 2652 | ||
| 2649 | // Add this componentGroup and its parent in WixGroup. | ||
| 2650 | this.Core.CreateWixGroupRow(sourceLineNumbers, parentType, parentId, ComplexReferenceChildType.ComponentGroup, id.Id); | 2653 | this.Core.CreateWixGroupRow(sourceLineNumbers, parentType, parentId, ComplexReferenceChildType.ComponentGroup, id.Id); |
| 2651 | } | 2654 | } |
| 2652 | } | 2655 | } |
diff --git a/src/wix/test/WixToolsetTest.Converters.Symbolizer/ConvertSymbolsFixture.cs b/src/wix/test/WixToolsetTest.Converters.Symbolizer/ConvertSymbolsFixture.cs index ef00738d..d7e0cb8f 100644 --- a/src/wix/test/WixToolsetTest.Converters.Symbolizer/ConvertSymbolsFixture.cs +++ b/src/wix/test/WixToolsetTest.Converters.Symbolizer/ConvertSymbolsFixture.cs | |||
| @@ -531,6 +531,10 @@ namespace WixToolsetTest.Converters.Symbolizer | |||
| 531 | break; | 531 | break; |
| 532 | } | 532 | } |
| 533 | 533 | ||
| 534 | case "WixComponentGroup": | ||
| 535 | fields = String.Empty; | ||
| 536 | break; | ||
| 537 | |||
| 534 | case "WixProperty": | 538 | case "WixProperty": |
| 535 | { | 539 | { |
| 536 | var wixPropertySymbol = (WixPropertySymbol)symbol; | 540 | var wixPropertySymbol = (WixPropertySymbol)symbol; |