diff --git a/samples/ControlCatalog/MainView.xaml b/samples/ControlCatalog/MainView.xaml
index 488aa0535f..f001425964 100644
--- a/samples/ControlCatalog/MainView.xaml
+++ b/samples/ControlCatalog/MainView.xaml
@@ -14,7 +14,6 @@
-
@@ -45,6 +44,7 @@
ScrollViewer.HorizontalScrollBarVisibility="Disabled">
+
diff --git a/samples/ControlCatalog/Pages/LabelsPage.axaml b/samples/ControlCatalog/Pages/LabelsPage.axaml
index 32c46f080d..961e7ba7e6 100644
--- a/samples/ControlCatalog/Pages/LabelsPage.axaml
+++ b/samples/ControlCatalog/Pages/LabelsPage.axaml
@@ -25,11 +25,11 @@
-
+
-
+
-
+
diff --git a/samples/ControlCatalog/Pages/RelativePanelPage.axaml b/samples/ControlCatalog/Pages/RelativePanelPage.axaml
index 3657d52bd9..4dcdcc195f 100644
--- a/samples/ControlCatalog/Pages/RelativePanelPage.axaml
+++ b/samples/ControlCatalog/Pages/RelativePanelPage.axaml
@@ -23,16 +23,16 @@
-
+
-
+
-
+
@@ -41,19 +41,19 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/src/Avalonia.Controls/Label.cs b/src/Avalonia.Controls/Label.cs
index 76708b8f00..9d5eda464f 100644
--- a/src/Avalonia.Controls/Label.cs
+++ b/src/Avalonia.Controls/Label.cs
@@ -29,6 +29,7 @@ namespace Avalonia.Controls
///
/// Label focus Target
///
+ [ResolveByName]
public IInputElement Target
{
get => _target;
diff --git a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
index 7d15a92274..5420df861c 160000
--- a/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
+++ b/src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
@@ -1 +1 @@
-Subproject commit 7d15a9227461cf4d62bc2ed251fcc25c96b28aaf
+Subproject commit 5420df861ce6f2be5ead9efa078fe7242ce88f18
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResolveByNameExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResolveByNameExtension.cs
index 8561aa898b..909462392c 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResolveByNameExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/ResolveByNameExtension.cs
@@ -30,7 +30,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
if (provideValueTarget.TargetProperty is IPropertyInfo property)
value.OnCompleted(() => property.Set(target, value.GetResult()));
- return null;
+ return AvaloniaProperty.UnsetValue;
}
}
}