diff --git a/src/Avalonia.Controls/Templates/FuncTemplateNameScopeExtensions.cs b/src/Avalonia.Controls/Templates/FuncTemplateNameScopeExtensions.cs index c9c083f9c7..76bc298e30 100644 --- a/src/Avalonia.Controls/Templates/FuncTemplateNameScopeExtensions.cs +++ b/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(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; - } } } diff --git a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs index b302237285..015a122677 100644 --- a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs +++ b/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); diff --git a/tests/Avalonia.Controls.UnitTests/CarouselTests.cs b/tests/Avalonia.Controls.UnitTests/CarouselTests.cs index f70a61f43a..b16ac6bb8e 100644 --- a/tests/Avalonia.Controls.UnitTests/CarouselTests.cs +++ b/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); } } } diff --git a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs index 879f32087d..599e214b31 100644 --- a/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ComboBoxTests.cs @@ -105,7 +105,7 @@ namespace Avalonia.Controls.UnitTests }.RegisterInNameScope(scope) }.RegisterInNameScope(scope) } - }.WithNameScope(scope); + }; }); } } diff --git a/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs b/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs index abddbe16ab..93355a22f2 100644 --- a/tests/Avalonia.Controls.UnitTests/ContentControlTests.cs +++ b/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); + }; }); } } diff --git a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs b/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs index ac30daf505..7de80f72cc 100644 --- a/tests/Avalonia.Controls.UnitTests/DatePickerTests.cs +++ b/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); diff --git a/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs b/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs index 832a19c02d..fcf7bf3c8c 100644 --- a/tests/Avalonia.Controls.UnitTests/HeaderedItemsControlTests .cs +++ b/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); + }; }); } } diff --git a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs index d5245869b3..6313da171f 100644 --- a/tests/Avalonia.Controls.UnitTests/ItemsControlTests.cs +++ b/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); + }; }); } diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs index ef61d34ee1..9a459328aa 100644 --- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs +++ b/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) diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs index ece9e27fb3..2a61ff1566 100644 --- a/tests/Avalonia.Controls.UnitTests/ListBoxTests_Single.cs +++ b/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) diff --git a/tests/Avalonia.Controls.UnitTests/Mixins/ContentControlMixinTests.cs b/tests/Avalonia.Controls.UnitTests/Mixins/ContentControlMixinTests.cs index 06679b2399..638443e17f 100644 --- a/tests/Avalonia.Controls.UnitTests/Mixins/ContentControlMixinTests.cs +++ b/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(); diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs index 020de2880e..a1571a4965 100644 --- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_InTemplate.cs +++ b/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 }; diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs index 5dd4deabf6..ab75a87110 100644 --- a/tests/Avalonia.Controls.UnitTests/Presenters/ContentPresenterTests_Standalone.cs +++ b/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((t, _) => new ContentControl() { Content = t }, false) }; diff --git a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs b/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs index dcbe8b4e0a..7a6cf0fba7 100644 --- a/tests/Avalonia.Controls.UnitTests/Presenters/ItemsPresenterTests_Virtualization_Simple.cs +++ b/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)); } } } diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs index 25dcea32ab..059146f17d 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs +++ b/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(); diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs index 4db542c4e1..e266150901 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs +++ b/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 diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs index 5fe7e270d9..2eeff4cdf9 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/RangeBaseTests.cs +++ b/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, diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs index cdb6aebb25..2372987c4c 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs +++ b/tests/Avalonia.Controls.UnitTests/Primitives/ScrollBarTests.cs @@ -186,7 +186,7 @@ namespace Avalonia.Controls.UnitTests.Primitives Template = new FuncControlTemplate(ThumbTemplate), }, }.RegisterInNameScope(scope), - }.WithNameScope(scope); + }; } private static Control ThumbTemplate(Thumb control, INameScope scope) diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs index 1036730575..bc002174ec 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests.cs +++ b/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 diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs index e2d306dd67..8618387150 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_AutoSelect.cs +++ b/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 diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs index 68884a6a4c..9d0cc368e0 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs +++ b/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 diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/TabStripTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/TabStripTests.cs index d7e78fdd0d..a7b90afa70 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/TabStripTests.cs +++ b/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); } } } diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs index cd5cee1329..03a9cde6ad 100644 --- a/tests/Avalonia.Controls.UnitTests/Primitives/TemplatedControlTests.cs +++ b/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(ScrollingContentControlTemplate), - Content = "foo" - }; - - var root = new TestRoot { Child = target }; - target.ApplyTemplate(); - - var border = target.GetVisualChildren().FirstOrDefault(); - Assert.IsType(border); - - var scrollViewer = border.GetVisualChildren().FirstOrDefault(); - Assert.IsType(scrollViewer); - ((ScrollViewer)scrollViewer).ApplyTemplate(); - - var scrollContentPresenter = scrollViewer.GetVisualChildren().FirstOrDefault(); - Assert.IsType(scrollContentPresenter); - ((ContentPresenter)scrollContentPresenter).UpdateChild(); - - var contentPresenter = scrollContentPresenter.GetVisualChildren().FirstOrDefault(); - Assert.IsType(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; } diff --git a/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs b/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs index 9076d8019c..75a2f4178b 100644 --- a/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs +++ b/tests/Avalonia.Controls.UnitTests/ScrollViewerTests.cs @@ -110,7 +110,7 @@ namespace Avalonia.Controls.UnitTests [Grid.ColumnProperty] = 1, }.RegisterInNameScope(scope), }, - }.WithNameScope(scope); + }; } } } diff --git a/tests/Avalonia.Controls.UnitTests/TabControlTests.cs b/tests/Avalonia.Controls.UnitTests/TabControlTests.cs index 35e1ed9e1c..ee8d9cc62e 100644 --- a/tests/Avalonia.Controls.UnitTests/TabControlTests.cs +++ b/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) diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs index 7b08b4811f..f40571bc39 100644 --- a/tests/Avalonia.Controls.UnitTests/TextBoxTests.cs +++ b/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) diff --git a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs b/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs index d9e60ffbcf..4aaf0ab5b7 100644 --- a/tests/Avalonia.Controls.UnitTests/TextBoxTests_DataValidation.cs +++ b/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 diff --git a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs b/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs index 99d55c4c5c..0ee772425b 100644 --- a/tests/Avalonia.Controls.UnitTests/TopLevelTests.cs +++ b/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 diff --git a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs b/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs index 21a7f4e6db..0380bb85ea 100644 --- a/tests/Avalonia.Controls.UnitTests/TreeViewTests.cs +++ b/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 ExtractItemHeader(TreeView tree, int level) diff --git a/tests/Avalonia.Controls.UnitTests/UserControlTests.cs b/tests/Avalonia.Controls.UnitTests/UserControlTests.cs index 7bcf8fe4f2..9d3e568582 100644 --- a/tests/Avalonia.Controls.UnitTests/UserControlTests.cs +++ b/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); + }; }); } } diff --git a/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs b/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs index 427c91d989..df522397ee 100644 --- a/tests/Avalonia.Controls.UnitTests/Utils/HotKeyManagerTests.cs +++ b/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); }); } } diff --git a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs b/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs index f4b3149e31..3ee6a50e69 100644 --- a/tests/Avalonia.Controls.UnitTests/WindowBaseTests.cs +++ b/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 diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs index b00ae47041..2bf47fbb64 100644 --- a/tests/Avalonia.LeakTests/ControlTests.cs +++ b/tests/Avalonia.LeakTests/ControlTests.cs @@ -74,7 +74,7 @@ namespace Avalonia.LeakTests { Name = "foo" }.RegisterInNameScope(scope) - }.WithNameScope(scope); + }; window.Show(); diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs index 3b10340312..dcecfe3b22 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/BindingExtensionTests.cs +++ b/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))) } }; } diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs index 186783dfb6..ed70cd6fe8 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/DynamicResourceExtensionTests.cs +++ b/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))) } }; } diff --git a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs b/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs index 1ad2eda014..7a96b9f989 100644 --- a/tests/Avalonia.Markup.Xaml.UnitTests/MarkupExtensions/StaticResourceExtensionTests.cs +++ b/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))) } }; } diff --git a/tests/Avalonia.ReactiveUI.UnitTests/AutoDataTemplateBindingHookTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/AutoDataTemplateBindingHookTest.cs index 5ed629dc5c..8769bf2b8b 100644 --- a/tests/Avalonia.ReactiveUI.UnitTests/AutoDataTemplateBindingHookTest.cs +++ b/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); + }; }); } } diff --git a/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs b/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs index 55cf4ef44e..302ab5e71d 100644 --- a/tests/Avalonia.ReactiveUI.UnitTests/TransitioningContentControlTest.cs +++ b/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); + }; }); } } diff --git a/tests/Avalonia.Styling.UnitTests/SelectorTests_Multiple.cs b/tests/Avalonia.Styling.UnitTests/SelectorTests_Multiple.cs index bfc02dbc3c..e8be44ed3b 100644 --- a/tests/Avalonia.Styling.UnitTests/SelectorTests_Multiple.cs +++ b/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 diff --git a/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs b/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs index ab6760b0a1..b8d53b38b2 100644 --- a/tests/Avalonia.Styling.UnitTests/StyledElementTests_Resources.cs +++ b/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)); } } } diff --git a/tests/Avalonia.UnitTests/TestTemplatedRoot.cs b/tests/Avalonia.UnitTests/TestTemplatedRoot.cs index 9008f3499f..b7e7a0276a 100644 --- a/tests/Avalonia.UnitTests/TestTemplatedRoot.cs +++ b/tests/Avalonia.UnitTests/TestTemplatedRoot.cs @@ -21,7 +21,7 @@ namespace Avalonia.UnitTests Template = new FuncControlTemplate((x, scope) => new ContentPresenter { Name = "PART_ContentPresenter", - }.RegisterInNameScope(scope).WithNameScope(scope)); + }.RegisterInNameScope(scope)); } public Size ClientSize => new Size(100, 100);