#1733: (2)

oleg-shilo · Jan 22, 2025 · fa52036 · fa52036
1 parent 7780192
commit fa52036
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Source/src/WixSharp/ComRegistration.cs b/Source/src/WixSharp/ComRegistration.cs
@@ -515,18 +515,22 @@ public void Process(ProcessingContext context)
             }
             else
             {
-                var findComponent = context.XParent.FindFirst("Component");
+                //Debug.Assert(false);
+
+                var findComponent = context.XParent.Parent("Component") ?? // lookup upwards
+                                    context.XParent.FindFirst("Component"); // lookup downwards
 
                 if (findComponent != null)
                 {
                     findComponent.Add(element);
                 }
                 else
                 {
-                    XElement newComponent = this.WrapInNewParentComponent(element);
-                    context.XParent.Add(newComponent);
+                    context.XParent.Add(element);
+                    //XElement newComponent = this.WrapInNewParentComponent(element);
+                    //context.XParent.Add(newComponent);
 
-                    MapComponentToFeatures(newComponent.Attr("Id"), ActualFeatures, context);
+                    //MapComponentToFeatures(newComponent.Attr("Id"), ActualFeatures, context);
                 }
             }