Add DateTimeOffsetConverter to the default converters list.

This is the fix for https://bugzilla.xamarin.com/show_bug.cgi?id=25158

Current implementation does not contain the DateTimeOffsetConverter
in the list of default converters. This cause NotSupportedException
to be thrown when trying to serialize/deserialize DateTimeOffset
values to/from strings.

In .NET Framework implementation this class is added to such a list.

diff --git a/mcs/class/System/System.ComponentModel/TypeDescriptor.cs b/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
index df7f55bcecfaca781ccfb380b566f65f53b447fd..9992eae79b7c227aac84d23602a0c1ec567e123d 100644 (file)
--- a/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
+++ b/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
@@ -409,6 +409,7 @@ public sealed class TypeDescriptor
                                defaultConverters.Add (new DictionaryEntry (typeof (Array), typeof (ArrayConverter)));
                                defaultConverters.Add (new DictionaryEntry (typeof (CultureInfo), typeof (CultureInfoConverter)));
                                defaultConverters.Add (new DictionaryEntry (typeof (DateTime), typeof (DateTimeConverter)));
+                               defaultConverters.Add (new DictionaryEntry (typeof (DateTimeOffset), typeof (DateTimeOffsetConverter)));
                                defaultConverters.Add (new DictionaryEntry (typeof (Guid), typeof (GuidConverter)));
                                defaultConverters.Add (new DictionaryEntry (typeof (TimeSpan), typeof (TimeSpanConverter)));
                                defaultConverters.Add (new DictionaryEntry (typeof (ICollection), typeof (CollectionConverter)));

diff --git a/mcs/class/System/Test/System.ComponentModel/TypeDescriptorTests.cs b/mcs/class/System/Test/System.ComponentModel/TypeDescriptorTests.cs
index a09776a9c00b41810928d26ee0e118948744c9de..c44f74dbaf3066a33b8d593ca10f2ea4ad26448a 100644 (file)
--- a/mcs/class/System/Test/System.ComponentModel/TypeDescriptorTests.cs
+++ b/mcs/class/System/Test/System.ComponentModel/TypeDescriptorTests.cs
@@ -1244,6 +1244,7 @@ namespace MonoTests.System.ComponentModel
                        Assert.IsTrue (TypeDescriptor.GetConverter (new Component()) is ComponentConverter, "#30");
 #endif
                        Assert.AreEqual (typeof (NullableConverter), TypeDescriptor.GetConverter (typeof (int?)).GetType (), "#31");
+                       Assert.AreEqual (typeof (DateTimeOffsetConverter), TypeDescriptor.GetConverter (typeof (DateTimeOffset)).GetType (), "#32");
                }
                
                [Test]