Merge pull request #1275 from ranma42/fix-lib64

[mono.git] / mcs / class / System.XML / System.Xml.Serialization / XmlCustomFormatter.cs

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs
index 44158f5dd5d5c329996593847cf6aa537a668047..dca5ac50d476444915e872aefbabc4c5fd4341a8 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs
@@ -272,11 +272,11 @@ namespace System.Xml.Serialization {
                                case "char": return (char)XmlConvert.ToInt32 (value);
 #if NET_2_0
                                case "dateTime": return XmlConvert.ToDateTime (value, XmlDateTimeSerializationMode.RoundtripKind);
-                               case "date": return DateTime.ParseExact (value, "yyyy-MM-dd", null);
+                               case "date": return XmlConvert.ToDateTime (value).Date;
                                case "time": return DateTime.ParseExact (value, "HH:mm:ss.FFFFFFF", null);
 #else
                                case "dateTime": return XmlConvert.ToDateTime (value);
-                               case "date": return DateTime.ParseExact (value, "yyyy-MM-dd", null);
+                               case "date": return XmlConvert.ToDateTime (value).Date;
                                case "time": return DateTime.ParseExact (value, "HH:mm:ss.fffffffzzz", null);
 #endif
                                case "decimal": return XmlConvert.ToDecimal (value);
@@ -375,11 +375,11 @@ namespace System.Xml.Serialization {
                                case "char": return "(char)Int32.Parse (" + value + ", CultureInfo.InvariantCulture)";
 #if NET_2_0
                                case "dateTime": return "XmlConvert.ToDateTime (" + value + ", XmlDateTimeSerializationMode.RoundtripKind)";
-                               case "date": return "DateTime.ParseExact (" + value + ", \"yyyy-MM-dd\", CultureInfo.InvariantCulture)";
+                               case "date": return "XmlConvert.ToDateTime (" + value + ").Date";
                                case "time": return "DateTime.ParseExact (" + value + ", \"HH:mm:ss.FFFFFFF\", CultureInfo.InvariantCulture)";
 #else
                                case "dateTime": return "XmlConvert.ToDateTime (" + value + ")";
-                               case "date": return "DateTime.ParseExact (" + value + ", \"yyyy-MM-dd\", CultureInfo.InvariantCulture)";
+                               case "date": return "XmlConvert.ToDateTime (" + value + ").Date";
                                case "time": return "DateTime.ParseExact (" + value + ", \"HH:mm:ss.fffffffzzz\", CultureInfo.InvariantCulture)";
 #endif
                                case "decimal": return "Decimal.Parse (" + value + ", CultureInfo.InvariantCulture)";