aboutsummaryrefslogtreecommitdiff
path: root/src/api
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2024-12-22 22:44:20 -0500
committerBob Arnson <bob@firegiant.com>2024-12-22 22:44:20 -0500
commitca9f6ae3b0f6a8fd882ca6fe43ad8d4ae7b53435 (patch)
tree2b83d7b69b678425a702e8cfc3835f8d07844cc9 /src/api
parentf440fb317c630e7bc6d4ee4d657a200654e2f876 (diff)
downloadwix-bob/MagicFilesinRootModules8860.tar.gz
wix-bob/MagicFilesinRootModules8860.tar.bz2
wix-bob/MagicFilesinRootModules8860.zip
Magicked files in modules need complex references.bob/MagicFilesinRootModules8860
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.cs8
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}