Removed WithNameScope

src/Avalonia.Controls/Templates/FuncTemplateNameScopeExtensions.cs

@@ -10,15 +10,5 @@ namespace Avalonia.Controls.Templates
             scope.Register(control.Name, control);
             return control;
         }
-
-        public static T WithNameScope<T>(this T control, INameScope scope)
-            where T : StyledElement
-        {
-            var existingScope = NameScope.GetNameScope(control);
-            if (existingScope != null && existingScope != scope)
-                throw new InvalidOperationException("Control already has a name scope");
-            NameScope.SetNameScope(control, scope);
-            return control;
-        }
     }
 }

tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs

@@ -1030,7 +1030,7 @@ namespace Avalonia.Controls.UnitTests
                         Name = "PART_Popup"
                     }.RegisterInNameScope(scope);
 
-                var panel = new Panel().WithNameScope(scope);
+                var panel = new Panel();
                 panel.Children.Add(textBox);
                 panel.Children.Add(popup);
                 panel.Children.Add(listbox);

tests/Avalonia.Controls.UnitTests/CarouselTests.cs

@@ -312,7 +312,7 @@ namespace Avalonia.Controls.UnitTests
                 [~CarouselPresenter.ItemsPanelProperty] = control[~Carousel.ItemsPanelProperty],
                 [~CarouselPresenter.SelectedIndexProperty] = control[~Carousel.SelectedIndexProperty],
                 [~CarouselPresenter.PageTransitionProperty] = control[~Carousel.PageTransitionProperty],
-            }.RegisterInNameScope(scope).WithNameScope(scope);
+            }.RegisterInNameScope(scope);
         }
     }
 }

tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs

@@ -105,7 +105,7 @@ namespace Avalonia.Controls.UnitTests
                             }.RegisterInNameScope(scope)
                         }.RegisterInNameScope(scope)
                     }
-                }.WithNameScope(scope);
+                };
             });
         }
     }

tests/Avalonia.Controls.UnitTests/ContentControlTests.cs

@@ -344,7 +344,7 @@ namespace Avalonia.Controls.UnitTests
                         [~ContentPresenter.ContentProperty] = parent[~ContentControl.ContentProperty],
                         [~ContentPresenter.ContentTemplateProperty] = parent[~ContentControl.ContentTemplateProperty],
                     }.RegisterInNameScope(scope)
-                }.WithNameScope(scope);
+                };
             });
         }
     }

tests/Avalonia.Controls.UnitTests/DatePickerTests.cs

@@ -116,7 +116,7 @@ namespace Avalonia.Controls.UnitTests
                         Name = "PART_Popup"
                     }.RegisterInNameScope(scope);
 
-                var panel = new Panel().WithNameScope(scope);
+                var panel = new Panel();
                 panel.Children.Add(textBox);
                 panel.Children.Add(button);
                 panel.Children.Add(popup);

tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs

@@ -72,7 +72,7 @@ namespace Avalonia.Controls.UnitTests
                         Name = "PART_HeaderPresenter",
                         [~ContentPresenter.ContentProperty] = parent[~HeaderedItemsControl.HeaderProperty],
                     }.RegisterInNameScope(scope)
-                }.WithNameScope(scope);
+                };
             });
         }
     }

tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs

@@ -589,7 +589,7 @@ namespace Avalonia.Controls.UnitTests
                         MemberSelector = parent.MemberSelector,
                         [~ItemsPresenter.ItemsProperty] = parent[~ItemsControl.ItemsProperty],
                     }.RegisterInNameScope(scope)
-                }.WithNameScope(scope);
+                };
             });
         }
 

tests/Avalonia.Controls.UnitTests/ListBoxTests.cs

@@ -346,7 +346,7 @@ namespace Avalonia.Controls.UnitTests
                         [~ItemsPresenter.ItemsPanelProperty] = parent.GetObservable(ItemsControl.ItemsPanelProperty).ToBinding(),
                         [~ItemsPresenter.VirtualizationModeProperty] = parent.GetObservable(ListBox.VirtualizationModeProperty).ToBinding(),
                     }.RegisterInNameScope(scope)
-                }.RegisterInNameScope(scope).WithNameScope(scope));
+                }.RegisterInNameScope(scope));
         }
 
         private FuncControlTemplate ListBoxItemTemplate()
@@ -357,7 +357,7 @@ namespace Avalonia.Controls.UnitTests
                     Name = "PART_ContentPresenter",
                     [!ContentPresenter.ContentProperty] = parent[!ListBoxItem.ContentProperty],
                     [!ContentPresenter.ContentTemplateProperty] = parent[!ListBoxItem.ContentTemplateProperty],
-                }.RegisterInNameScope(scope).WithNameScope(scope));
+                }.RegisterInNameScope(scope));
         }
 
         private FuncControlTemplate ScrollViewerTemplate()
@@ -370,7 +370,7 @@ namespace Avalonia.Controls.UnitTests
                     [~~ScrollContentPresenter.ExtentProperty] = parent[~~ScrollViewer.ExtentProperty],
                     [~~ScrollContentPresenter.OffsetProperty] = parent[~~ScrollViewer.OffsetProperty],
                     [~~ScrollContentPresenter.ViewportProperty] = parent[~~ScrollViewer.ViewportProperty],
-                }.RegisterInNameScope(scope).WithNameScope(scope));
+                }.RegisterInNameScope(scope));
         }
 
         private void Prepare(ListBox target)

tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs

@@ -255,7 +255,7 @@ namespace Avalonia.Controls.UnitTests
                     Name = "PART_ItemsPresenter",
                     [~ItemsPresenter.ItemsProperty] = parent.GetObservable(ItemsControl.ItemsProperty).ToBinding(),
                 }.RegisterInNameScope(scope)
-            }.WithNameScope(scope);
+            };
         }
 
         private Control CreateScrollViewerTemplate(ITemplatedControl parent, INameScope scope)
@@ -265,7 +265,7 @@ namespace Avalonia.Controls.UnitTests
                 Name = "PART_ContentPresenter",
                 [~ContentPresenter.ContentProperty] =
                     parent.GetObservable(ContentControl.ContentProperty).ToBinding(),
-            }.RegisterInNameScope(scope).WithNameScope(scope);
+            }.RegisterInNameScope(scope);
         }
 
         private void ApplyTemplate(ListBox target)

tests/Avalonia.Controls.UnitTests/Mixins/ContentControlMixinTests.cs

@@ -28,7 +28,7 @@ namespace Avalonia.Controls.UnitTests.Mixins
                         new ContentPresenter {Name = "Content_1_Presenter"}.RegisterInNameScope(scope),
                         new ContentPresenter {Name = "Content_2_Presenter"}.RegisterInNameScope(scope)
                     }
-                }.WithNameScope(scope))
+                })
             };
             
 
@@ -51,7 +51,7 @@ namespace Avalonia.Controls.UnitTests.Mixins
                         p1.RegisterInNameScope(scope),
                         p2.RegisterInNameScope(scope)
                     }
-                }.WithNameScope(scope))
+                })
             };
             target.ApplyTemplate();
 

tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs

@@ -300,7 +300,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                     new ContentPresenter
                     {
                         Name = "PART_ContentPresenter",
-                    }.RegisterInNameScope(s).WithNameScope(s)),
+                    }.RegisterInNameScope(s)),
             };
             var root = new TestRoot { Child = templatedParent };
 

tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs

@@ -98,7 +98,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                     Name = "PART_ContentPresenter",
                     [~ContentPresenter.ContentProperty] = c[~ContentControl.ContentProperty],
                     [~ContentPresenter.ContentTemplateProperty] = c[~ContentControl.ContentTemplateProperty]
-                }.RegisterInNameScope(scope).WithNameScope(scope)),
+                }.RegisterInNameScope(scope)),
                 ContentTemplate =
                     new FuncDataTemplate<string>((t, _) => new ContentControl() { Content = t }, false)
             };

tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs

@@ -1100,7 +1100,7 @@ namespace Avalonia.Controls.UnitTests.Presenters
                     Name = "PART_ContentPresenter",
                     [~ContentPresenter.ContentProperty] = parent[~ContentControl.ContentProperty],
                     [~ContentPresenter.ContentTemplateProperty] = parent[~ContentControl.ContentTemplateProperty],
-                }.RegisterInNameScope(scope).WithNameScope(scope));
+                }.RegisterInNameScope(scope));
             }
         }
     }

tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs

@@ -139,7 +139,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     {
                         Name = "PART_ContentPresenter",
                         [!ContentPresenter.ContentProperty] = parent[!PopupRoot.ContentProperty],
-                    }.RegisterInNameScope(scope).WithNameScope(scope)),
+                    }.RegisterInNameScope(scope)),
             };
 
             result.ApplyTemplate();

tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs

@@ -321,7 +321,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             {
                 Name = "PART_ContentPresenter",
                 [~ContentPresenter.ContentProperty] = control[~ContentControl.ContentProperty],
-            }.RegisterInNameScope(scope).WithNameScope(scope);
+            }.RegisterInNameScope(scope);
         }
 
         private static IControl PopupContentControlTemplate(PopupContentControl control, INameScope scope)
@@ -333,7 +333,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 {
                     [~ContentPresenter.ContentProperty] = control[~ContentControl.ContentProperty],
                 }
-            }.RegisterInNameScope(scope).WithNameScope(scope);
+            }.RegisterInNameScope(scope);
         }
 
         private class PopupContentControl : ContentControl

tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs

@@ -138,7 +138,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                         track[~~Track.ValueProperty] = c[~~RangeBase.ValueProperty];
                     }
 
-                    return track.WithNameScope(scope);
+                    return track;
                 }),
                 Minimum = 0,
                 Maximum = 100,

tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs

@@ -186,7 +186,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                         Template = new FuncControlTemplate<Thumb>(ThumbTemplate),
                     },
                 }.RegisterInNameScope(scope),
-            }.WithNameScope(scope);
+            };
         }
 
         private static Control ThumbTemplate(Thumb control, INameScope scope)

tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs

@@ -902,7 +902,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     Name = "itemsPresenter",
                     [~ItemsPresenter.ItemsProperty] = control[~ItemsControl.ItemsProperty],
                     [~ItemsPresenter.ItemsPanelProperty] = control[~ItemsControl.ItemsPanelProperty],
-                }.RegisterInNameScope(scope).WithNameScope(scope));
+                }.RegisterInNameScope(scope));
         }
 
         private class Item : Control, ISelectable

tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs

@@ -90,7 +90,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     Name = "itemsPresenter",
                     [~ItemsPresenter.ItemsProperty] = control[~ItemsControl.ItemsProperty],
                     [~ItemsPresenter.ItemsPanelProperty] = control[~ItemsControl.ItemsPanelProperty],
-                }.RegisterInNameScope(scope).WithNameScope(scope));
+                }.RegisterInNameScope(scope));
         }
 
         private class TestSelector : SelectingItemsControl

tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs

@@ -1041,7 +1041,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     Name = "PART_ItemsPresenter",
                     [~ItemsPresenter.ItemsProperty] = control[~ItemsControl.ItemsProperty],
                     [~ItemsPresenter.ItemsPanelProperty] = control[~ItemsControl.ItemsPanelProperty],
-                }.RegisterInNameScope(scope).WithNameScope(scope));
+                }.RegisterInNameScope(scope));
         }
 
         private class TestSelector : SelectingItemsControl

tests/Avalonia.Controls.UnitTests/Primitives/TabStripTests.cs

@@ -166,7 +166,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Name = "itemsPresenter",
                 [!ItemsPresenter.ItemsProperty] = parent[!ItemsControl.ItemsProperty],
                 [!ItemsPresenter.MemberSelectorProperty] = parent[!ItemsControl.MemberSelectorProperty],
-            }.RegisterInNameScope(scope).WithNameScope(scope);
+            }.RegisterInNameScope(scope);
         }
     }
 }

tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs

@@ -271,41 +271,6 @@ namespace Avalonia.Controls.UnitTests.Primitives
             Assert.Equal(target, textBlock.TemplatedParent);
         }
 
-        [Fact]
-        public void Nested_TemplatedControls_Should_Register_With_Correct_NameScope()
-        {
-            var target = new ContentControl
-            {
-                Template = new FuncControlTemplate<ContentControl>(ScrollingContentControlTemplate),
-                Content = "foo"
-            };
-
-            var root = new TestRoot { Child = target };
-            target.ApplyTemplate();
-
-            var border = target.GetVisualChildren().FirstOrDefault();
-            Assert.IsType<Border>(border);
-
-            var scrollViewer = border.GetVisualChildren().FirstOrDefault();
-            Assert.IsType<ScrollViewer>(scrollViewer);
-            ((ScrollViewer)scrollViewer).ApplyTemplate();
-
-            var scrollContentPresenter = scrollViewer.GetVisualChildren().FirstOrDefault();
-            Assert.IsType<ScrollContentPresenter>(scrollContentPresenter);
-            ((ContentPresenter)scrollContentPresenter).UpdateChild();
-
-            var contentPresenter = scrollContentPresenter.GetVisualChildren().FirstOrDefault();
-            Assert.IsType<ContentPresenter>(contentPresenter);
-
-            var borderNs = NameScope.GetNameScope((Control)border);
-            var scrollContentPresenterNs = NameScope.GetNameScope((Control)scrollContentPresenter);
-
-            Assert.NotNull(borderNs);
-            Assert.Same(scrollViewer, borderNs.Find("ScrollViewer"));
-            Assert.Same(contentPresenter, borderNs.Find("PART_ContentPresenter"));
-            Assert.Same(scrollContentPresenter, scrollContentPresenterNs.Find("PART_ContentPresenter"));
-        }
-
         [Fact]
         public void ApplyTemplate_Should_Raise_TemplateApplied()
         {
@@ -587,7 +552,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                         [!ContentPresenter.ContentProperty] = control[!ContentControl.ContentProperty],
                     }.RegisterInNameScope(scope)
                 }.RegisterInNameScope(scope)
-            }.WithNameScope(scope);
+            };
         }
 
         private static Control ScrollViewerTemplate(ScrollViewer control, INameScope scope)
@@ -596,7 +561,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             {
                 Name = "PART_ContentPresenter",
                 [~ContentPresenter.ContentProperty] = control[~ContentControl.ContentProperty],
-            }.RegisterInNameScope(scope).WithNameScope(scope);
+            }.RegisterInNameScope(scope);
 
             return result;
         }

tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs

@@ -110,7 +110,7 @@ namespace Avalonia.Controls.UnitTests
                         [Grid.ColumnProperty] = 1,
                     }.RegisterInNameScope(scope),
                 },
-            }.WithNameScope(scope);
+            };
         }
     }
 }

tests/Avalonia.Controls.UnitTests/TabControlTests.cs

@@ -307,7 +307,7 @@ namespace Avalonia.Controls.UnitTests
                             [!ContentPresenter.ContentTemplateProperty] = parent[!TabControl.SelectedContentTemplateProperty],
                         }.RegisterInNameScope(scope)
                     }
-                }.WithNameScope(scope));
+                });
         }
 
         private IControlTemplate TabItemTemplate()
@@ -318,7 +318,7 @@ namespace Avalonia.Controls.UnitTests
                     Name = "PART_ContentPresenter",
                     [!ContentPresenter.ContentProperty] = parent[!TabItem.HeaderProperty],
                     [!ContentPresenter.ContentTemplateProperty] = parent[!TabItem.HeaderTemplateProperty]
-                }.RegisterInNameScope(scope).WithNameScope(scope));
+                }.RegisterInNameScope(scope));
         }
 
         private void ApplyTemplate(TabControl target)

tests/Avalonia.Controls.UnitTests/TextBoxTests.cs

@@ -467,7 +467,7 @@ namespace Avalonia.Controls.UnitTests
                         Priority = BindingPriority.TemplatedParent,
                         RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
                     },
-                }.RegisterInNameScope(scope).WithNameScope(scope));
+                }.RegisterInNameScope(scope));
         }
 
         private void RaiseKeyEvent(TextBox textBox, Key key, InputModifiers inputModifiers)

tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs

@@ -104,7 +104,7 @@ namespace Avalonia.Controls.UnitTests
                         Priority = BindingPriority.TemplatedParent,
                         RelativeSource = new RelativeSource(RelativeSourceMode.TemplatedParent),
                     },
-                }.RegisterInNameScope(scope).WithNameScope(scope));
+                }.RegisterInNameScope(scope));
         }
 
         private class ExceptionTest

tests/Avalonia.Controls.UnitTests/TopLevelTests.cs

@@ -231,7 +231,7 @@ namespace Avalonia.Controls.UnitTests
                 {
                     Name = "PART_ContentPresenter",
                     [!ContentPresenter.ContentProperty] = x[!ContentControl.ContentProperty],
-                }.RegisterInNameScope(scope).WithNameScope(scope));
+                }.RegisterInNameScope(scope));
         }
 
         private class TestTopLevel : TopLevel

tests/Avalonia.Controls.UnitTests/TreeViewTests.cs

@@ -803,7 +803,7 @@ namespace Avalonia.Controls.UnitTests
             {
                 Name = "PART_ItemsPresenter",
                 [~ItemsPresenter.ItemsProperty] = parent[~ItemsControl.ItemsProperty],
-            }.RegisterInNameScope(scope).WithNameScope(scope));
+            }.RegisterInNameScope(scope));
         }
 
         private IControlTemplate CreateTreeViewItemTemplate()
@@ -823,7 +823,7 @@ namespace Avalonia.Controls.UnitTests
                         [~ItemsPresenter.ItemsProperty] = parent[~ItemsControl.ItemsProperty],
                     }.RegisterInNameScope(scope)
                 }
-            }.WithNameScope(scope));
+            });
         }
 
         private List<string> ExtractItemHeader(TreeView tree, int level)

tests/Avalonia.Controls.UnitTests/UserControlTests.cs

@@ -50,7 +50,7 @@ namespace Avalonia.Controls.UnitTests
                         Name = "PART_ContentPresenter",
                         [~ContentPresenter.ContentProperty] = parent[~ContentControl.ContentProperty],
                     }.RegisterInNameScope(scope)
-                }.WithNameScope(scope);
+                };
             });
         }
     }

tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs

@@ -65,7 +65,7 @@ namespace Avalonia.Controls.UnitTests.Utils
                 {
                     Name = "PART_ContentPresenter",
                     [~ContentPresenter.ContentProperty] = parent[~ContentControl.ContentProperty],
-                }.RegisterInNameScope(scope).WithNameScope(scope);
+                }.RegisterInNameScope(scope);
             });
         }
     }

tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs

@@ -258,7 +258,7 @@ namespace Avalonia.Controls.UnitTests
                 {
                     Name = "PART_ContentPresenter",
                     [!ContentPresenter.ContentProperty] = x[!ContentControl.ContentProperty],
-                }.RegisterInNameScope(scope).WithNameScope(scope));
+                }.RegisterInNameScope(scope));
         }
 
         private class TestWindowBase : WindowBase

tests/Avalonia.LeakTests/ControlTests.cs

@@ -74,7 +74,7 @@ namespace Avalonia.LeakTests
                         {
                             Name = "foo"
                         }.RegisterInNameScope(scope)
-                    }.WithNameScope(scope);
+                    };
 
                     window.Show();
 

tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs

@@ -63,7 +63,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
                             {
                                 Name = "PART_ContentPresenter",
                                 [!ContentPresenter.ContentProperty] = x[!Window.ContentProperty],
-                            }.RegisterInNameScope(scope).WithNameScope(scope)))
+                            }.RegisterInNameScope(scope)))
                 }
             };
         }

tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs

@@ -652,7 +652,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
                             {
                                 Name = "PART_ContentPresenter",
                                 [!ContentPresenter.ContentProperty] = x[!Window.ContentProperty],
-                            }.RegisterInNameScope(scope).WithNameScope(scope)))
+                            }.RegisterInNameScope(scope)))
                 }
             };
         }

tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs

@@ -539,7 +539,7 @@ namespace Avalonia.Markup.Xaml.UnitTests.MarkupExtensions
                             {
                                 Name = "PART_ContentPresenter",
                                 [!ContentPresenter.ContentProperty] = x[!Window.ContentProperty],
-                            }.RegisterInNameScope(scope).WithNameScope(scope)))
+                            }.RegisterInNameScope(scope)))
                 }
             };
         }

tests/Avalonia.ReactiveUI.UnitTests/AutoDataTemplateBindingHookTest.cs

@@ -109,7 +109,7 @@ namespace Avalonia.ReactiveUI.UnitTests
                         MemberSelector = parent.MemberSelector,
                         [~ItemsPresenter.ItemsProperty] = parent[~ItemsControl.ItemsProperty],
                     }.RegisterInNameScope(scope)
-                }.WithNameScope(scope);
+                };
             });
         }
     }

tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs

@@ -56,7 +56,7 @@ namespace Avalonia.ReactiveUI.UnitTests
                         [~ContentPresenter.ContentProperty] = parent[~ContentControl.ContentProperty],
                         [~ContentPresenter.ContentTemplateProperty] = parent[~ContentControl.ContentTemplateProperty],
                     }.RegisterInNameScope(scope)
-                }.WithNameScope(scope);
+                };
             });
         }
     }

tests/Avalonia.Styling.UnitTests/SelectorTests_Multiple.cs

@@ -21,7 +21,7 @@ namespace Avalonia.Styling.UnitTests
                 return new Border
                 {
                     Name = "border",
-                }.RegisterInNameScope(scope).WithNameScope(scope);
+                }.RegisterInNameScope(scope);
             });
 
             var control = new Button
@@ -60,7 +60,7 @@ namespace Avalonia.Styling.UnitTests
                 return new Border
                 {
                     Name = "border",
-                }.RegisterInNameScope(scope).WithNameScope(scope);
+                }.RegisterInNameScope(scope);
             });
 
             var control = new Button
@@ -93,7 +93,7 @@ namespace Avalonia.Styling.UnitTests
                 return new Border
                 {
                     Name = "border",
-                }.RegisterInNameScope(scope).WithNameScope(scope);
+                }.RegisterInNameScope(scope);
             });
 
             var control = new Button

tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs

@@ -227,7 +227,7 @@ namespace Avalonia.Controls.UnitTests
                 {
                     Name = "PART_ContentPresenter",
                     [!ContentPresenter.ContentProperty] = x[!ContentControl.ContentProperty],
-                }.RegisterInNameScope(scope).WithNameScope(scope));
+                }.RegisterInNameScope(scope));
         }
     }
 }

tests/Avalonia.UnitTests/TestTemplatedRoot.cs

@@ -21,7 +21,7 @@ namespace Avalonia.UnitTests
             Template = new FuncControlTemplate<TestTemplatedRoot>((x, scope) => new ContentPresenter
             {
                 Name = "PART_ContentPresenter",
-            }.RegisterInNameScope(scope).WithNameScope(scope));
+            }.RegisterInNameScope(scope));
         }
 
         public Size ClientSize => new Size(100, 100);