From b2a758a77e9002d756292e12581af9a04a14f9ac Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sun, 25 Oct 2020 14:43:47 +0000 Subject: [PATCH] fix resolvebyname extension so it can never return null. --- .../MarkupExtensions/ResolveByNameExtension.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } } }