From 5b15fe4b4114332ed91f8dce9d5867be484d86ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mi=C5=82osz=20Kukla?= Date: Sat, 28 Sep 2019 16:01:17 +0200 Subject: [PATCH] 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) {