Merge pull request #3024 from miloszkukla/master

Allow to use object as a resource key in Static/DynamicResourceExtension + Rename ResourceProviderExtensions to ResourceNodeExtensions

src/Avalonia.Styling/Controls/ResourceProviderExtensions.cs → 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.

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;
         }

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)
         {