diff options
author | Bob Arnson <bob@firegiant.com> | 2024-12-22 22:44:20 -0500 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2024-12-27 10:01:53 -0800 |
commit | 28a2c0e963897ddc61e6673bcb93e10b9696375f (patch) | |
tree | e2490d899f231aadaa48cf029d42b77c0da75f73 /src/api | |
parent | 5dc8c8975b2356654410b2ba4755dfa2c32e7b91 (diff) | |
download | wix-28a2c0e963897ddc61e6673bcb93e10b9696375f.tar.gz wix-28a2c0e963897ddc61e6673bcb93e10b9696375f.tar.bz2 wix-28a2c0e963897ddc61e6673bcb93e10b9696375f.zip |
Magicked files in modules need complex references.
Magic files (naked `File`s and `Files`) that are direct children of a
`Module` need complex references from the generated component to that
module, to ensure that they're wired up correctly as module components.
Fixes https://github.com/wixtoolset/issues/issues/8860
Diffstat (limited to 'src/api')
-rw-r--r-- | src/api/wix/WixToolset.Data/Symbols/HarvestFilesSymbol.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/api/wix/WixToolset.Data/Symbols/HarvestFilesSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/HarvestFilesSymbol.cs index a3123fc1..6b56625e 100644 --- a/src/api/wix/WixToolset.Data/Symbols/HarvestFilesSymbol.cs +++ b/src/api/wix/WixToolset.Data/Symbols/HarvestFilesSymbol.cs | |||
@@ -16,6 +16,7 @@ namespace WixToolset.Data | |||
16 | new IntermediateFieldDefinition(nameof(HarvestFilesSymbolFields.ComplexReferenceParentType), IntermediateFieldType.String), | 16 | new IntermediateFieldDefinition(nameof(HarvestFilesSymbolFields.ComplexReferenceParentType), IntermediateFieldType.String), |
17 | new IntermediateFieldDefinition(nameof(HarvestFilesSymbolFields.ParentId), IntermediateFieldType.String), | 17 | new IntermediateFieldDefinition(nameof(HarvestFilesSymbolFields.ParentId), IntermediateFieldType.String), |
18 | new IntermediateFieldDefinition(nameof(HarvestFilesSymbolFields.SourcePath), IntermediateFieldType.String), | 18 | new IntermediateFieldDefinition(nameof(HarvestFilesSymbolFields.SourcePath), IntermediateFieldType.String), |
19 | new IntermediateFieldDefinition(nameof(HarvestFilesSymbolFields.ModuleLanguage), IntermediateFieldType.String), | ||
19 | }, | 20 | }, |
20 | typeof(HarvestFilesSymbol)); | 21 | typeof(HarvestFilesSymbol)); |
21 | } | 22 | } |
@@ -31,6 +32,7 @@ namespace WixToolset.Data.Symbols | |||
31 | ComplexReferenceParentType, | 32 | ComplexReferenceParentType, |
32 | ParentId, | 33 | ParentId, |
33 | SourcePath, | 34 | SourcePath, |
35 | ModuleLanguage, | ||
34 | } | 36 | } |
35 | 37 | ||
36 | public class HarvestFilesSymbol : IntermediateSymbol | 38 | public class HarvestFilesSymbol : IntermediateSymbol |
@@ -80,5 +82,11 @@ namespace WixToolset.Data.Symbols | |||
80 | get => (string)this.Fields[(int)HarvestFilesSymbolFields.SourcePath]; | 82 | get => (string)this.Fields[(int)HarvestFilesSymbolFields.SourcePath]; |
81 | set => this.Set((int)HarvestFilesSymbolFields.SourcePath, value); | 83 | set => this.Set((int)HarvestFilesSymbolFields.SourcePath, value); |
82 | } | 84 | } |
85 | |||
86 | public string ModuleLanguage | ||
87 | { | ||
88 | get => (string)this.Fields[(int)HarvestFilesSymbolFields.ModuleLanguage]; | ||
89 | set => this.Set((int)HarvestFilesSymbolFields.ModuleLanguage, value); | ||
90 | } | ||
83 | } | 91 | } |
84 | } | 92 | } |