aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-05-22 14:53:27 -0700
committerRob Mensching <rob@firegiant.com>2020-05-22 15:25:19 -0700
commit6b30680fd7a712b45538c3f0a89d652f0457a893 (patch)
tree46ef7f7d51de4189b7ef1af07dda3add16ad302f /src/WixToolset.Core
parent236f958468923f65a8f02e406601fb47e71cd58e (diff)
downloadwix-6b30680fd7a712b45538c3f0a89d652f0457a893.tar.gz
wix-6b30680fd7a712b45538c3f0a89d652f0457a893.tar.bz2
wix-6b30680fd7a712b45538c3f0a89d652f0457a893.zip
Support merging merge modules
Diffstat (limited to 'src/WixToolset.Core')
-rw-r--r--src/WixToolset.Core/Linker.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs
index 98232901..7b381347 100644
--- a/src/WixToolset.Core/Linker.cs
+++ b/src/WixToolset.Core/Linker.cs
@@ -356,7 +356,7 @@ namespace WixToolset.Core
356 case TupleDefinitionType.WixMerge: 356 case TupleDefinitionType.WixMerge:
357 if (SectionType.Product == resolvedSection.Type) 357 if (SectionType.Product == resolvedSection.Type)
358 { 358 {
359 this.ResolveFeatures(tuple, 0, 7, modulesToFeatures, null); 359 this.ResolveFeatures(tuple, -1, (int)WixMergeTupleFields.FeatureRef, modulesToFeatures, null);
360 } 360 }
361 break; 361 break;
362 362
@@ -1316,7 +1316,7 @@ namespace WixToolset.Core
1316 /// <param name="multipleFeatureComponents">Hashtable of known components under multiple features.</param> 1316 /// <param name="multipleFeatureComponents">Hashtable of known components under multiple features.</param>
1317 private void ResolveFeatures(IntermediateTuple tuple, int connectionColumn, int featureColumn, ConnectToFeatureCollection connectToFeatures, Hashtable multipleFeatureComponents) 1317 private void ResolveFeatures(IntermediateTuple tuple, int connectionColumn, int featureColumn, ConnectToFeatureCollection connectToFeatures, Hashtable multipleFeatureComponents)
1318 { 1318 {
1319 var connectionId = tuple.AsString(connectionColumn); 1319 var connectionId = connectionColumn < 0 ? tuple.Id.Id : tuple.AsString(connectionColumn);
1320 var featureId = tuple.AsString(featureColumn); 1320 var featureId = tuple.AsString(featureColumn);
1321 1321
1322 if (EmptyGuid == featureId) 1322 if (EmptyGuid == featureId)