Imported Upstream version 4.2.0.179

Former-commit-id: 4610231f55806d2a05ed69e5ff3faa7336cc1479
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent aa7da660d6
commit c042cd0c52
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -21,6 +21,7 @@ namespace System.Xml.Serialization {
/// The <see cref="XmlCustomFormatter"/> class provides a set of static methods for converting
/// primitive type values to and from their XML string representations.</summary>
internal class XmlCustomFormatter {
#if CONFIGURATION_DEP
private static DateTimeSerializationSection.DateTimeSerializationMode mode;
static DateTimeSerializationSection.DateTimeSerializationMode Mode {
@@ -38,6 +39,7 @@ namespace System.Xml.Serialization {
return mode;
}
}
#endif
private XmlCustomFormatter() {}
internal static string FromDefaultValue(object value, string formatter) {
if (value == null) return null;
@@ -79,13 +81,13 @@ namespace System.Xml.Serialization {
}
internal static string FromDateTime(DateTime value) {
#if CONFIGURATION_DEP
if (Mode == DateTimeSerializationSection.DateTimeSerializationMode.Local) {
return XmlConvert.ToString(value, "yyyy-MM-ddTHH:mm:ss.fffffffzzzzzz");
}
else {
#endif
// for mode DateTimeSerializationMode.Roundtrip and DateTimeSerializationMode.Default
return XmlConvert.ToString(value, XmlDateTimeSerializationMode.RoundtripKind);
}
}
internal static string FromChar(char value) {
@@ -314,10 +316,13 @@ namespace System.Xml.Serialization {
};
internal static DateTime ToDateTime(string value) {
#if CONFIGURATION_DEP
if (Mode == DateTimeSerializationSection.DateTimeSerializationMode.Local) {
return ToDateTime(value, allDateTimeFormats);
}
else {
else
#endif
{
// for mode DateTimeSerializationMode.Roundtrip and DateTimeSerializationMode.Default
return XmlConvert.ToDateTime(value, XmlDateTimeSerializationMode.RoundtripKind);
}