From 1f1e67c79781418a7404de8e9023c5f0d06169e2 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 21 May 2018 20:32:43 +0200 Subject: [PATCH] Don't use Parse for types that XAML handles. --- src/Markup/Avalonia.Markup.Xaml/AvaloniaTypeConverters.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Markup/Avalonia.Markup.Xaml/AvaloniaTypeConverters.cs b/src/Markup/Avalonia.Markup.Xaml/AvaloniaTypeConverters.cs index ad9b8eb7d1..36c03be65a 100644 --- a/src/Markup/Avalonia.Markup.Xaml/AvaloniaTypeConverters.cs +++ b/src/Markup/Avalonia.Markup.Xaml/AvaloniaTypeConverters.cs @@ -58,8 +58,12 @@ namespace Avalonia.Markup.Xaml return result?.MakeGenericType(type.GetGenericArguments()); } - // If the type has a static Parse method, use that. - if (!type.IsPrimitive && ParseTypeConverter.HasParseMethod(type)) + // If the type isn't a primitive or a type that XAML already handles, but has a static + // Parse method, use that + if (!type.IsPrimitive && + type != typeof(DateTime) && + type != typeof(Uri) && + ParseTypeConverter.HasParseMethod(type)) { result = typeof(ParseTypeConverter<>).MakeGenericType(type); _converters.Add(type, result);