aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Core/Linker.cs
diff options
context:
space:
mode:
Diffstat (limited to 'src/WixToolset.Core/Linker.cs')
-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)