diff options
| author | Marek Safar <masafa@microsoft.com> | 2016-08-08 19:30:44 +0300 |
|---|---|---|
| committer | Marek Safar <masafa@microsoft.com> | 2016-08-09 19:07:14 +0300 |
| commit | b6a30059db8319348ebb454cc303633dfabd6a29 (patch) | |
| tree | dfaa5b26537a6d5d0fbea0f13da9573b16d37f3e /mcs/class/System.XML | |
| parent | f34c0223fce6b42ebfbe82ddc257095e5c490d10 (diff) | |
[bcl] Update Reference Source to .NET Framework 4.6.2
Diffstat (limited to 'mcs/class/System.XML')
| -rw-r--r-- | mcs/class/System.XML/ReferenceSources/LocalAppContextSwitches.cs | 9 | ||||
| -rw-r--r-- | mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationWriterTests.cs | 18 |
2 files changed, 7 insertions, 20 deletions
diff --git a/mcs/class/System.XML/ReferenceSources/LocalAppContextSwitches.cs b/mcs/class/System.XML/ReferenceSources/LocalAppContextSwitches.cs index 9c961021fd6..bc03e96bbd8 100644 --- a/mcs/class/System.XML/ReferenceSources/LocalAppContextSwitches.cs +++ b/mcs/class/System.XML/ReferenceSources/LocalAppContextSwitches.cs @@ -1,7 +1,8 @@ namespace System { - static class LocalAppContextSwitches { - public const bool IgnoreEmptyKeySequences = false; - public const bool DontThrowOnInvalidSurrogatePairs = false; - } + static class LocalAppContextSwitches { + public static readonly bool IgnoreEmptyKeySequences = false; + public static readonly bool DontThrowOnInvalidSurrogatePairs = false; + public static readonly bool IgnoreKindInUtcTimeSerialization = false; + } }
\ No newline at end of file diff --git a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationWriterTests.cs b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationWriterTests.cs index afa18715f26..4b81d7366ff 100644 --- a/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationWriterTests.cs +++ b/mcs/class/System.XML/Test/System.Xml.Serialization/XmlSerializationWriterTests.cs @@ -1575,30 +1575,16 @@ namespace MonoTests.System.XmlSerialization ser.Serialize (sw, d); string str = sw.ToString (); - str = RemoveTZ (str, "MyTime"); - str = RemoveTZ (str, "MyTimeNullable"); - var expected = "<?xml version=\"1.0\" encoding=\"utf-16\"?>" + Environment.NewLine + "<root xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" + Environment.NewLine + -" <MyTime>10:00:00.0000000$TZ$</MyTime>" + Environment.NewLine + -" <MyTimeNullable>10:00:00.0000000$TZ$</MyTimeNullable>" + Environment.NewLine + +" <MyTime>10:00:00.0000000Z</MyTime>" + Environment.NewLine + +" <MyTimeNullable>10:00:00.0000000Z</MyTimeNullable>" + Environment.NewLine + " <MyDate>2012-01-03</MyDate>" + Environment.NewLine + " <MyDateNullable>2012-01-03</MyDateNullable>" + Environment.NewLine + "</root>"; Assert.AreEqual (expected, str); } - - static string RemoveTZ (string str, string tag) - { - var st = str.IndexOf ("<" + tag + ">"); - var et = str.IndexOf ("</" + tag + ">"); - if (st < 0 || et < 0) - return str; - - var start = str.IndexOfAny (new [] { '+', '-' }, st, et - st); - return str.Substring (0, start) + "$TZ$" + str.Substring (et, str.Length - et); - } } } |