Fix Feature parent

4 files changed, 206 insertions, 244 deletions

diff --git a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
index 170b138d..75a694d1 100644
--- a/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
+++ b/src/WixToolset.Core.WindowsInstaller/Bind/CreateOutputFromIRCommand.cs
@@ -185,6 +185,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind
                 case TupleDefinitionType.WixFile:
                 case TupleDefinitionType.WixComponentGroup:
                 case TupleDefinitionType.WixDeltaPatchFile:
+                case TupleDefinitionType.WixFeatureGroup:
                     break;
 
                 default:
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs
index c4bbf86d..7f078dbc 100644
--- a/src/WixToolset.Core/Compiler.cs
+++ b/src/WixToolset.Core/Compiler.cs
@@ -4855,6 +4855,7 @@ namespace WixToolset.Core
             {
                 var tuple = new FeatureTuple(sourceLineNumbers, id)
                 {
+                    ParentFeatureRef = null, // this field is set in the linker
                     Title = title,
                     Description = description,
                     Display = display,
@@ -4867,46 +4868,6 @@ namespace WixToolset.Core
                 };
 
                 this.Core.AddTuple(tuple);
-                //var row = this.Core.CreateRow(sourceLineNumbers, TupleDefinitionType.Feature, id);
-                //// row.Set(1, null); - this column is set in the linker
-                //row.Set(2, title);
-                //row.Set(3, description);
-                //if (0 < display.Length)
-                //{
-                //    switch (display)
-                //    {
-                //    case "collapse":
-                //        lastDisplay = (lastDisplay | 1) + 1;
-                //        row.Set(4, lastDisplay);
-                //        break;
-                //    case "expand":
-                //        lastDisplay = (lastDisplay + 1) | 1;
-                //        row.Set(4, lastDisplay);
-                //        break;
-                //    case "hidden":
-                //        row.Set(4, 0);
-                //        break;
-                //    default:
-                //        int value;
-                //        if (!Int32.TryParse(display, NumberStyles.Integer, CultureInfo.InvariantCulture, out value))
-                //        {
-                //            this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Display", display, "collapse", "expand", "hidden"));
-                //        }
-                //        else
-                //        {
-                //            row.Set(4, value);
-                //            // save the display value of this row (if its not hidden) for subsequent rows
-                //            if (0 != (int)row[4])
-                //            {
-                //                lastDisplay = (int)row[4];
-                //            }
-                //        }
-                //        break;
-                //    }
-                //}
-                //row.Set(5, level);
-                //row.Set(6, configurableDirectory);
-                //row.Set(7, bits);
 
                 if (ComplexReferenceParentType.Unknown != parentType)
                 {
@@ -6228,7 +6189,7 @@ namespace WixToolset.Core
                         this.ParseFeatureElement(child, ComplexReferenceParentType.Unknown, null, ref featureDisplay);
                         break;
                     case "FeatureGroup":
-                        this.ParseFeatureGroupElement(child, ComplexReferenceParentType.Unknown, id.Id);
+                        this.ParseFeatureGroupElement(child, ComplexReferenceParentType.Unknown, id?.Id);
                         break;
                     case "FeatureRef":
                         this.ParseFeatureRefElement(child, ComplexReferenceParentType.Unknown, null);
diff --git a/src/WixToolset.Core/Linker.cs b/src/WixToolset.Core/Linker.cs
index 1f28802b..9526ac95 100644
--- a/src/WixToolset.Core/Linker.cs
+++ b/src/WixToolset.Core/Linker.cs
@@ -244,12 +244,12 @@ namespace WixToolset.Core
                                 break;
 #endif
 
-                        case TupleDefinitionType.Class:
-                            if (SectionType.Product == resolvedSection.Type)
-                            {
-                                this.ResolveFeatures(tuple, 2, 11, componentsToFeatures, multipleFeatureComponents);
-                            }
-                            break;
+                            case TupleDefinitionType.Class:
+                                if (SectionType.Product == resolvedSection.Type)
+                                {
+                                    this.ResolveFeatures(tuple, 2, 11, componentsToFeatures, multipleFeatureComponents);
+                                }
+                                break;
 
 #if MOVE_TO_BACKEND
                             case "CustomAction":
@@ -303,12 +303,12 @@ namespace WixToolset.Core
                                 }
                                 break;
 #endif
-                        case TupleDefinitionType.Extension:
-                            if (SectionType.Product == resolvedSection.Type)
-                            {
-                                this.ResolveFeatures(tuple, 1, 4, componentsToFeatures, multipleFeatureComponents);
-                            }
-                            break;
+                            case TupleDefinitionType.Extension:
+                                if (SectionType.Product == resolvedSection.Type)
+                                {
+                                    this.ResolveFeatures(tuple, 1, 4, componentsToFeatures, multipleFeatureComponents);
+                                }
+                                break;
 
 #if MOVE_TO_BACKEND
                             case TupleDefinitionType.ModuleSubstitution:
@@ -320,12 +320,12 @@ namespace WixToolset.Core
                                 break;
 #endif
 
-                        case TupleDefinitionType.Assembly:
-                            if (SectionType.Product == resolvedSection.Type)
-                            {
-                                this.ResolveFeatures(tuple, 0, 1, componentsToFeatures, multipleFeatureComponents);
-                            }
-                            break;
+                            case TupleDefinitionType.Assembly:
+                                if (SectionType.Product == resolvedSection.Type)
+                                {
+                                    this.ResolveFeatures(tuple, 0, 1, componentsToFeatures, multipleFeatureComponents);
+                                }
+                                break;
 
 #if MOVE_TO_BACKEND
                             case "ProgId":
@@ -347,26 +347,26 @@ namespace WixToolset.Core
                                 break;
 #endif
 
-                        case TupleDefinitionType.PublishComponent:
-                            if (SectionType.Product == resolvedSection.Type)
-                            {
-                                this.ResolveFeatures(tuple, 2, 4, componentsToFeatures, multipleFeatureComponents);
-                            }
-                            break;
+                            case TupleDefinitionType.PublishComponent:
+                                if (SectionType.Product == resolvedSection.Type)
+                                {
+                                    this.ResolveFeatures(tuple, 2, 4, componentsToFeatures, multipleFeatureComponents);
+                                }
+                                break;
 
-                        case TupleDefinitionType.Shortcut:
-                            if (SectionType.Product == resolvedSection.Type)
-                            {
-                                this.ResolveFeatures(tuple, 3, 4, componentsToFeatures, multipleFeatureComponents);
-                            }
-                            break;
+                            case TupleDefinitionType.Shortcut:
+                                if (SectionType.Product == resolvedSection.Type)
+                                {
+                                    this.ResolveFeatures(tuple, 3, 4, componentsToFeatures, multipleFeatureComponents);
+                                }
+                                break;
 
-                        case TupleDefinitionType.TypeLib:
-                            if (SectionType.Product == resolvedSection.Type)
-                            {
-                                this.ResolveFeatures(tuple, 2, 6, componentsToFeatures, multipleFeatureComponents);
-                            }
-                            break;
+                            case TupleDefinitionType.TypeLib:
+                                if (SectionType.Product == resolvedSection.Type)
+                                {
+                                    this.ResolveFeatures(tuple, 2, 6, componentsToFeatures, multipleFeatureComponents);
+                                }
+                                break;
 
 #if SOLVE_CUSTOM_TABLE
                             case "WixCustomTable":
@@ -384,9 +384,9 @@ namespace WixToolset.Core
                                 break;
 #endif
 
-                        case TupleDefinitionType.WixEnsureTable:
-                            ensureTableRows.Add(tuple);
-                            break;
+                            case TupleDefinitionType.WixEnsureTable:
+                                ensureTableRows.Add(tuple);
+                                break;
 
 
 #if MOVE_TO_BACKEND
@@ -409,46 +409,46 @@ namespace WixToolset.Core
                                 break;
 #endif
 
-                        case TupleDefinitionType.WixMerge:
-                            if (SectionType.Product == resolvedSection.Type)
-                            {
-                                this.ResolveFeatures(tuple, 0, 7, modulesToFeatures, null);
-                            }
-                            break;
-
-                        case TupleDefinitionType.WixComplexReference:
-                            copyTuple = false;
-                            break;
+                            case TupleDefinitionType.WixMerge:
+                                if (SectionType.Product == resolvedSection.Type)
+                                {
+                                    this.ResolveFeatures(tuple, 0, 7, modulesToFeatures, null);
+                                }
+                                break;
 
-                        case TupleDefinitionType.WixSimpleReference:
-                            copyTuple = false;
-                            break;
+                            case TupleDefinitionType.WixComplexReference:
+                                copyTuple = false;
+                                break;
 
-                        case TupleDefinitionType.WixVariable:
-                        // check for colliding values and collect the wix variable rows
-                        {
-                            var row = (WixVariableTuple)tuple;
-                            var id = row.Id.Id;
+                            case TupleDefinitionType.WixSimpleReference:
+                                copyTuple = false;
+                                break;
 
-                            if (wixVariables.TryGetValue(id, out var collidingRow))
+                            case TupleDefinitionType.WixVariable:
+                            // check for colliding values and collect the wix variable rows
                             {
-                                if (collidingRow.Overridable && !row.Overridable)
+                                var row = (WixVariableTuple)tuple;
+                                var id = row.Id.Id;
+
+                                if (wixVariables.TryGetValue(id, out var collidingRow))
                                 {
-                                    wixVariables[id] = row;
+                                    if (collidingRow.Overridable && !row.Overridable)
+                                    {
+                                        wixVariables[id] = row;
+                                    }
+                                    else if (!row.Overridable || (collidingRow.Overridable && row.Overridable))
+                                    {
+                                        this.OnMessage(ErrorMessages.WixVariableCollision(row.SourceLineNumbers, id));
+                                    }
                                 }
-                                else if (!row.Overridable || (collidingRow.Overridable && row.Overridable))
+                                else
                                 {
-                                    this.OnMessage(ErrorMessages.WixVariableCollision(row.SourceLineNumbers, id));
+                                    wixVariables.Add(id, row);
                                 }
                             }
-                            else
-                            {
-                                wixVariables.Add(id, row);
-                            }
-                        }
 
-                        copyTuple = false;
-                        break;
+                            copyTuple = false;
+                            break;
                         }
 
                         if (copyTuple)
@@ -1152,154 +1152,154 @@ namespace WixToolset.Core
                     ConnectToFeature connection;
                     switch (wixComplexReferenceRow.ParentType)
                     {
-                    case ComplexReferenceParentType.Feature:
-                        switch (wixComplexReferenceRow.ChildType)
-                        {
-                        case ComplexReferenceChildType.Component:
-                            connection = componentsToFeatures[wixComplexReferenceRow.Child];
-                            if (null == connection)
-                            {
-                                componentsToFeatures.Add(new ConnectToFeature(section, wixComplexReferenceRow.Child, wixComplexReferenceRow.Parent, wixComplexReferenceRow.IsPrimary));
-                            }
-                            else if (wixComplexReferenceRow.IsPrimary)
+                        case ComplexReferenceParentType.Feature:
+                            switch (wixComplexReferenceRow.ChildType)
                             {
-                                if (connection.IsExplicitPrimaryFeature)
-                                {
-                                    this.OnMessage(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), connection.PrimaryFeature ?? resolvedSection.Id));
-                                    continue;
-                                }
-                                else
-                                {
-                                    connection.ConnectFeatures.Add(connection.PrimaryFeature); // move the guessed primary feature to the list of connects
-                                    connection.PrimaryFeature = wixComplexReferenceRow.Parent; // set the new primary feature
-                                    connection.IsExplicitPrimaryFeature = true; // and make sure we remember that we set it so we can fail if we try to set it again
-                                }
-                            }
-                            else
-                            {
-                                connection.ConnectFeatures.Add(wixComplexReferenceRow.Parent);
-                            }
+                                case ComplexReferenceChildType.Component:
+                                    connection = componentsToFeatures[wixComplexReferenceRow.Child];
+                                    if (null == connection)
+                                    {
+                                        componentsToFeatures.Add(new ConnectToFeature(section, wixComplexReferenceRow.Child, wixComplexReferenceRow.Parent, wixComplexReferenceRow.IsPrimary));
+                                    }
+                                    else if (wixComplexReferenceRow.IsPrimary)
+                                    {
+                                        if (connection.IsExplicitPrimaryFeature)
+                                        {
+                                            this.OnMessage(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), connection.PrimaryFeature ?? resolvedSection.Id));
+                                            continue;
+                                        }
+                                        else
+                                        {
+                                            connection.ConnectFeatures.Add(connection.PrimaryFeature); // move the guessed primary feature to the list of connects
+                                            connection.PrimaryFeature = wixComplexReferenceRow.Parent; // set the new primary feature
+                                            connection.IsExplicitPrimaryFeature = true; // and make sure we remember that we set it so we can fail if we try to set it again
+                                        }
+                                    }
+                                    else
+                                    {
+                                        connection.ConnectFeatures.Add(wixComplexReferenceRow.Parent);
+                                    }
 
-                            // add a row to the FeatureComponents table
-                            var featureComponent = new FeatureComponentsTuple();
-                            featureComponent.FeatureRef = wixComplexReferenceRow.Parent;
-                            featureComponent.ComponentRef = wixComplexReferenceRow.Child;
+                                    // add a row to the FeatureComponents table
+                                    var featureComponent = new FeatureComponentsTuple();
+                                    featureComponent.FeatureRef = wixComplexReferenceRow.Parent;
+                                    featureComponent.ComponentRef = wixComplexReferenceRow.Child;
 
-                            featureComponents.Add(featureComponent);
+                                    featureComponents.Add(featureComponent);
 
-                            // index the component for finding orphaned records
-                            var symbolName = String.Concat("Component:", wixComplexReferenceRow.Child);
-                            referencedComponents.Add(symbolName);
+                                    // index the component for finding orphaned records
+                                    var symbolName = String.Concat("Component:", wixComplexReferenceRow.Child);
+                                    referencedComponents.Add(symbolName);
 
-                            break;
+                                    break;
 
-                        case ComplexReferenceChildType.Feature:
-                            connection = featuresToFeatures[wixComplexReferenceRow.Child];
-                            if (null != connection)
-                            {
-                                this.OnMessage(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id)));
-                                continue;
-                            }
+                                case ComplexReferenceChildType.Feature:
+                                    connection = featuresToFeatures[wixComplexReferenceRow.Child];
+                                    if (null != connection)
+                                    {
+                                        this.OnMessage(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id)));
+                                        continue;
+                                    }
 
-                            featuresToFeatures.Add(new ConnectToFeature(section, wixComplexReferenceRow.Child, wixComplexReferenceRow.Parent, wixComplexReferenceRow.IsPrimary));
-                            break;
+                                    featuresToFeatures.Add(new ConnectToFeature(section, wixComplexReferenceRow.Child, wixComplexReferenceRow.Parent, wixComplexReferenceRow.IsPrimary));
+                                    break;
 
-                        case ComplexReferenceChildType.Module:
-                            connection = modulesToFeatures[wixComplexReferenceRow.Child];
-                            if (null == connection)
-                            {
-                                modulesToFeatures.Add(new ConnectToFeature(section, wixComplexReferenceRow.Child, wixComplexReferenceRow.Parent, wixComplexReferenceRow.IsPrimary));
-                            }
-                            else if (wixComplexReferenceRow.IsPrimary)
-                            {
-                                if (connection.IsExplicitPrimaryFeature)
-                                {
-                                    this.OnMessage(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id)));
-                                    continue;
-                                }
-                                else
-                                {
-                                    connection.ConnectFeatures.Add(connection.PrimaryFeature); // move the guessed primary feature to the list of connects
-                                    connection.PrimaryFeature = wixComplexReferenceRow.Parent; // set the new primary feature
-                                    connection.IsExplicitPrimaryFeature = true; // and make sure we remember that we set it so we can fail if we try to set it again
-                                }
-                            }
-                            else
-                            {
-                                connection.ConnectFeatures.Add(wixComplexReferenceRow.Parent);
+                                case ComplexReferenceChildType.Module:
+                                    connection = modulesToFeatures[wixComplexReferenceRow.Child];
+                                    if (null == connection)
+                                    {
+                                        modulesToFeatures.Add(new ConnectToFeature(section, wixComplexReferenceRow.Child, wixComplexReferenceRow.Parent, wixComplexReferenceRow.IsPrimary));
+                                    }
+                                    else if (wixComplexReferenceRow.IsPrimary)
+                                    {
+                                        if (connection.IsExplicitPrimaryFeature)
+                                        {
+                                            this.OnMessage(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id)));
+                                            continue;
+                                        }
+                                        else
+                                        {
+                                            connection.ConnectFeatures.Add(connection.PrimaryFeature); // move the guessed primary feature to the list of connects
+                                            connection.PrimaryFeature = wixComplexReferenceRow.Parent; // set the new primary feature
+                                            connection.IsExplicitPrimaryFeature = true; // and make sure we remember that we set it so we can fail if we try to set it again
+                                        }
+                                    }
+                                    else
+                                    {
+                                        connection.ConnectFeatures.Add(wixComplexReferenceRow.Parent);
+                                    }
+                                    break;
+
+                                default:
+                                    throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, "Unexpected complex reference child type: {0}", Enum.GetName(typeof(ComplexReferenceChildType), wixComplexReferenceRow.ChildType)));
                             }
                             break;
 
-                        default:
-                            throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, "Unexpected complex reference child type: {0}", Enum.GetName(typeof(ComplexReferenceChildType), wixComplexReferenceRow.ChildType)));
-                        }
-                        break;
-
-                    case ComplexReferenceParentType.Module:
-                        switch (wixComplexReferenceRow.ChildType)
-                        {
-                        case ComplexReferenceChildType.Component:
-                            if (componentsToModules.ContainsKey(wixComplexReferenceRow.Child))
-                            {
-                                this.OnMessage(ErrorMessages.ComponentReferencedTwice(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.Child));
-                                continue;
-                            }
-                            else
+                        case ComplexReferenceParentType.Module:
+                            switch (wixComplexReferenceRow.ChildType)
                             {
-                                componentsToModules.Add(wixComplexReferenceRow.Child, wixComplexReferenceRow); // should always be new
+                                case ComplexReferenceChildType.Component:
+                                    if (componentsToModules.ContainsKey(wixComplexReferenceRow.Child))
+                                    {
+                                        this.OnMessage(ErrorMessages.ComponentReferencedTwice(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.Child));
+                                        continue;
+                                    }
+                                    else
+                                    {
+                                        componentsToModules.Add(wixComplexReferenceRow.Child, wixComplexReferenceRow); // should always be new
 
-                                // add a row to the ModuleComponents table
-                                var moduleComponent = new ModuleComponentsTuple();
-                                moduleComponent.Component = wixComplexReferenceRow.Child;
-                                moduleComponent.ModuleID = wixComplexReferenceRow.Parent;
-                                moduleComponent.Language = Convert.ToInt32(wixComplexReferenceRow.ParentLanguage);
-                            }
+                                        // add a row to the ModuleComponents table
+                                        var moduleComponent = new ModuleComponentsTuple();
+                                        moduleComponent.Component = wixComplexReferenceRow.Child;
+                                        moduleComponent.ModuleID = wixComplexReferenceRow.Parent;
+                                        moduleComponent.Language = Convert.ToInt32(wixComplexReferenceRow.ParentLanguage);
+                                    }
+
+                                    // index the component for finding orphaned records
+                                    var componentSymbolName = String.Concat("Component:", wixComplexReferenceRow.Child);
+                                    referencedComponents.Add(componentSymbolName);
 
-                            // index the component for finding orphaned records
-                            var componentSymbolName = String.Concat("Component:", wixComplexReferenceRow.Child);
-                            referencedComponents.Add(componentSymbolName);
+                                    break;
 
+                                default:
+                                    throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, "Unexpected complex reference child type: {0}", Enum.GetName(typeof(ComplexReferenceChildType), wixComplexReferenceRow.ChildType)));
+                            }
                             break;
 
-                        default:
-                            throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, "Unexpected complex reference child type: {0}", Enum.GetName(typeof(ComplexReferenceChildType), wixComplexReferenceRow.ChildType)));
-                        }
-                        break;
+                        case ComplexReferenceParentType.Patch:
+                            switch (wixComplexReferenceRow.ChildType)
+                            {
+                                case ComplexReferenceChildType.PatchFamily:
+                                case ComplexReferenceChildType.PatchFamilyGroup:
+                                    break;
 
-                    case ComplexReferenceParentType.Patch:
-                        switch (wixComplexReferenceRow.ChildType)
-                        {
-                        case ComplexReferenceChildType.PatchFamily:
-                        case ComplexReferenceChildType.PatchFamilyGroup:
+                                default:
+                                    throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, "Unexpected complex reference child type: {0}", Enum.GetName(typeof(ComplexReferenceChildType), wixComplexReferenceRow.ChildType)));
+                            }
                             break;
 
-                        default:
-                            throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, "Unexpected complex reference child type: {0}", Enum.GetName(typeof(ComplexReferenceChildType), wixComplexReferenceRow.ChildType)));
-                        }
-                        break;
-
-                    case ComplexReferenceParentType.Product:
-                        switch (wixComplexReferenceRow.ChildType)
-                        {
-                        case ComplexReferenceChildType.Feature:
-                            connection = featuresToFeatures[wixComplexReferenceRow.Child];
-                            if (null != connection)
+                        case ComplexReferenceParentType.Product:
+                            switch (wixComplexReferenceRow.ChildType)
                             {
-                                this.OnMessage(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id)));
-                                continue;
-                            }
+                                case ComplexReferenceChildType.Feature:
+                                    connection = featuresToFeatures[wixComplexReferenceRow.Child];
+                                    if (null != connection)
+                                    {
+                                        this.OnMessage(ErrorMessages.MultiplePrimaryReferences(wixComplexReferenceRow.SourceLineNumbers, wixComplexReferenceRow.ChildType.ToString(), wixComplexReferenceRow.Child, wixComplexReferenceRow.ParentType.ToString(), wixComplexReferenceRow.Parent, (null != connection.PrimaryFeature ? "Feature" : "Product"), (null != connection.PrimaryFeature ? connection.PrimaryFeature : resolvedSection.Id)));
+                                        continue;
+                                    }
+
+                                    featuresToFeatures.Add(new ConnectToFeature(section, wixComplexReferenceRow.Child, null, wixComplexReferenceRow.IsPrimary));
+                                    break;
 
-                            featuresToFeatures.Add(new ConnectToFeature(section, wixComplexReferenceRow.Child, null, wixComplexReferenceRow.IsPrimary));
+                                default:
+                                    throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, "Unexpected complex reference child type: {0}", Enum.GetName(typeof(ComplexReferenceChildType), wixComplexReferenceRow.ChildType)));
+                            }
                             break;
 
                         default:
-                            throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, "Unexpected complex reference child type: {0}", Enum.GetName(typeof(ComplexReferenceChildType), wixComplexReferenceRow.ChildType)));
-                        }
-                        break;
-
-                    default:
-                        // Note: Groups have been processed before getting here so they are not handled by any case above.
-                        throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, "Unexpected complex reference child type: {0}", Enum.GetName(typeof(ComplexReferenceParentType), wixComplexReferenceRow.ParentType)));
+                            // Note: Groups have been processed before getting here so they are not handled by any case above.
+                            throw new InvalidOperationException(String.Format(CultureInfo.CurrentUICulture, "Unexpected complex reference child type: {0}", Enum.GetName(typeof(ComplexReferenceParentType), wixComplexReferenceRow.ParentType)));
                     }
                 }
 
@@ -1614,7 +1614,7 @@ namespace WixToolset.Core
             groups.FlattenAndRewriteGroups(ComplexReferenceParentType.Package, false);
             groups.FlattenAndRewriteGroups(ComplexReferenceParentType.Container, false);
             groups.FlattenAndRewriteGroups(ComplexReferenceParentType.Layout, false);
-            
+
             // Create Chain packages...
             groups.UseTypes(new[] { ComplexReferenceParentType.PackageGroup }, new[] { ComplexReferenceChildType.Package, ComplexReferenceChildType.PackageGroup });
             groups.FlattenAndRewriteRows(ComplexReferenceChildType.PackageGroup, "WixChain", false);
@@ -1631,17 +1631,17 @@ namespace WixToolset.Core
         {
             foreach (ConnectToFeature connection in featuresToFeatures)
             {
-                var wixSimpleReferenceRow = new WixSimpleReferenceTuple();
-                wixSimpleReferenceRow.Table = "Feature";
-                wixSimpleReferenceRow.PrimaryKeys = connection.ChildId;
+                var wixSimpleReferenceRow = new WixSimpleReferenceTuple
+                {
+                    Table = "Feature",
+                    PrimaryKeys = connection.ChildId
+                };
 
-                if (!allSymbols.TryGetValue(wixSimpleReferenceRow.SymbolicName, out var symbol))
+                if (allSymbols.TryGetValue(wixSimpleReferenceRow.SymbolicName, out var symbol))
                 {
-                    continue;
+                    var featureTuple = (FeatureTuple)symbol.Row;
+                    featureTuple.ParentFeatureRef = connection.PrimaryFeature;
                 }
-
-                var row = symbol.Row;
-                row.Set(1, connection.PrimaryFeature);
             }
         }
 
diff --git a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
index 6ff4e237..c391abac 100644
--- a/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
+++ b/src/test/WixToolsetTest.CoreIntegration/MsiQueryFixture.cs
@@ -217,7 +217,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void PopulatesDirectoryTableWithValidDefaultDir()
         {
             var folder = TestData.Get(@"TestData");
@@ -259,7 +259,7 @@ namespace WixToolsetTest.CoreIntegration
             }
         }
 
-        [Fact(Skip = "Test demonstrates failure")]
+        [Fact]
         public void PopulatesFeatureTableWithParent()
         {
             var folder = TestData.Get(@"TestData");