From 3fadc669b58a2ed5f5a6f3b8377cd6ff55a963f1 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Thu, 28 Oct 2021 22:25:31 +0100
Subject: [PATCH] ensure static resource can implicitly convert to brush when
 used in setters.

---
 .../MarkupExtensions/StaticResourceExtension.cs             | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
index 4ad68fc63e..db33b88cc3 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -5,6 +5,7 @@ using Avalonia.Controls;
 using Avalonia.Markup.Data;
 using Avalonia.Markup.Xaml.Converters;
 using Avalonia.Markup.Xaml.XamlIl.Runtime;
+using Avalonia.Styling;
 
 namespace Avalonia.Markup.Xaml.MarkupExtensions
 {
@@ -33,6 +34,11 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
                 _ => null,
             };
 
+            if (provideTarget.TargetObject is Setter setter)
+            {
+                targetType = setter.Property.PropertyType;
+            }
+
             // Look upwards though the ambient context for IResourceHosts and IResourceProviders
             // which might be able to give us the resource.
             foreach (var e in stack.Parents)