From 6b30680fd7a712b45538c3f0a89d652f0457a893 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 22 May 2020 14:53:27 -0700
Subject: Support merging merge modules

---
 src/WixToolset.Core/Linker.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/WixToolset.Core')

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
                             case TupleDefinitionType.WixMerge:
                                 if (SectionType.Product == resolvedSection.Type)
                                 {
-                                    this.ResolveFeatures(tuple, 0, 7, modulesToFeatures, null);
+                                    this.ResolveFeatures(tuple, -1, (int)WixMergeTupleFields.FeatureRef, modulesToFeatures, null);
                                 }
                                 break;
 
@@ -1316,7 +1316,7 @@ namespace WixToolset.Core
         /// <param name="multipleFeatureComponents">Hashtable of known components under multiple features.</param>
         private void ResolveFeatures(IntermediateTuple tuple, int connectionColumn, int featureColumn, ConnectToFeatureCollection connectToFeatures, Hashtable multipleFeatureComponents)
         {
-            var connectionId = tuple.AsString(connectionColumn);
+            var connectionId = connectionColumn < 0 ? tuple.Id.Id : tuple.AsString(connectionColumn);
             var featureId = tuple.AsString(featureColumn);
 
             if (EmptyGuid == featureId)
-- 
cgit v1.2.3-55-g6feb