2010-01-15 Atsushi Enomoto <atsushi@ximian.com>

	* XmlConvert.cs : shorten format string patterns.

svn path=/trunk/mcs/; revision=149612

diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
index 1a16d6d888c9f7d2c249aee1efbc5fc3b271c759..0e3a94d7a087240ce810c29633ed4ad624fbbf14 100644 (file)
--- 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  <atsushi@ximian.com>
+
+       * XmlConvert.cs : shorten format string patterns.
+
 2010-01-15  Atsushi Enomoto  <atsushi@ximian.com>
 
        * 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 6bbf18ddcd99cb469ba73d0fa2c98be035e44d9c..a4ccaa10cfac83c6b1f18adcc29b7b2026a892f7 100644 (file)
--- 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",