From 82992f86970ef617457393f2f26a044be5383c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=82osz=20Kukla?= <milosz.kukla@gmail.com>
Date: Mon, 23 Sep 2019 02:24:57 +0200
Subject: [PATCH 1/2] Rename ResourceProviderExtensions to
 ResourceNodeExtensions

---
 ...{ResourceProviderExtensions.cs => ResourceNodeExtensions.cs} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/Avalonia.Styling/Controls/{ResourceProviderExtensions.cs => ResourceNodeExtensions.cs} (98%)

diff --git a/src/Avalonia.Styling/Controls/ResourceProviderExtensions.cs b/src/Avalonia.Styling/Controls/ResourceNodeExtensions.cs
similarity index 98%
rename from src/Avalonia.Styling/Controls/ResourceProviderExtensions.cs
rename to src/Avalonia.Styling/Controls/ResourceNodeExtensions.cs
index 01112eaf2c..19a16f86c4 100644
--- a/src/Avalonia.Styling/Controls/ResourceProviderExtensions.cs
+++ b/src/Avalonia.Styling/Controls/ResourceNodeExtensions.cs
@@ -3,7 +3,7 @@ using Avalonia.Reactive;
 
 namespace Avalonia.Controls
 {
-    public static class ResourceProviderExtensions
+    public static class ResourceNodeExtensions
     {
         /// <summary>
         /// Finds the specified resource by searching up the logical tree and then global styles.

From 5b15fe4b4114332ed91f8dce9d5867be484d86ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mi=C5=82osz=20Kukla?= <milosz.kukla@gmail.com>
Date: Sat, 28 Sep 2019 16:01:17 +0200
Subject: [PATCH 2/2] Allow to use object as a resource key in
 Static/DynamicResourceExtension

---
 .../MarkupExtensions/DynamicResourceExtension.cs              | 2 +-
 .../MarkupExtensions/StaticResourceExtension.cs               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
index 0a9289bec9..5bdb0cc235 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/DynamicResourceExtension.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
         {
         }
 
-        public DynamicResourceExtension(string resourceKey)
+        public DynamicResourceExtension(object resourceKey)
         {
             ResourceKey = resourceKey;
         }
diff --git a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
index d6b170ae9d..6d055e033f 100644
--- a/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/MarkupExtensions/StaticResourceExtension.cs
@@ -16,12 +16,12 @@ namespace Avalonia.Markup.Xaml.MarkupExtensions
         {
         }
 
-        public StaticResourceExtension(string resourceKey)
+        public StaticResourceExtension(object resourceKey)
         {
             ResourceKey = resourceKey;
         }
 
-        public string ResourceKey { get; set; }
+        public object ResourceKey { get; set; }
 
         public object ProvideValue(IServiceProvider serviceProvider)
         {