From 46787574657180838d2be557f6e0d7f5afca1934 Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Fri, 15 Jan 2010 09:52:46 +0000 Subject: [PATCH] 2010-01-15 Atsushi Enomoto * XmlConvert.cs : shorten format string patterns. svn path=/trunk/mcs/; revision=149612 --- mcs/class/System.XML/System.Xml/ChangeLog | 4 ++++ mcs/class/System.XML/System.Xml/XmlConvert.cs | 15 +++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index 1a16d6d888c..0e3a94d7a08 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,3 +1,7 @@ +2010-01-15 Atsushi Enomoto + + * XmlConvert.cs : shorten format string patterns. + 2010-01-15 Atsushi Enomoto * XmlConvert.cs : DateTimeOffset parse is sloppy. diff --git a/mcs/class/System.XML/System.Xml/XmlConvert.cs b/mcs/class/System.XML/System.Xml/XmlConvert.cs index 6bbf18ddcd9..a4ccaa10cfa 100644 --- a/mcs/class/System.XML/System.Xml/XmlConvert.cs +++ b/mcs/class/System.XML/System.Xml/XmlConvert.cs @@ -54,6 +54,20 @@ namespace System.Xml { static readonly string [] datetimeFormats = { // dateTime +#if NET_2_0 + "yyyy-MM-ddTHH:mm:sszzz", + "yyyy-MM-ddTHH:mm:ss.FFFFFFFzzz", + "yyyy-MM-ddTHH:mm:ssZ", + "yyyy-MM-ddTHH:mm:ss.FFFFFFFZ", + "yyyy-MM-ddTHH:mm:ss", + "yyyy-MM-ddTHH:mm:ss.FFFFFFF", + "HH:mm:ss", + "HH:mm:ss.FFFFFFF", + "HH:mm:sszzz", + "HH:mm:ss.FFFFFFFzzz", + "HH:mm:ssZ", + "HH:mm:ss.FFFFFFFZ", +#else // it is not required in trunk but should make it easy to backport... "yyyy-MM-ddTHH:mm:sszzz", "yyyy-MM-ddTHH:mm:ss.fzzz", "yyyy-MM-ddTHH:mm:ss.ffzzz", @@ -103,6 +117,7 @@ namespace System.Xml { "HH:mm:ss.fffffZ", "HH:mm:ss.ffffffZ", "HH:mm:ss.fffffffZ", +#endif // date "yyyy-MM-dd", "yyyy-MM-ddzzz", -- 2.25.1