Merge branch 'json-schema' of github.com:JamesNK/Newtonsoft.Json into json-schema

This commit is contained in:
James Newton-King
2014-12-02 00:43:29 +13:00
2 changed files with 3 additions and 1 deletions
@@ -491,7 +491,7 @@ namespace Newtonsoft.Json.Tests.Converters
Value2 = DuplicateNameEnum2.foo_bar_NOT_USED Value2 = DuplicateNameEnum2.foo_bar_NOT_USED
}); });
Console.WriteLine(Encoding.UTF8.GetString(ms.ToArray())); Console.WriteLine(Encoding.UTF8.GetString(ms.ToArray(), 0, (int)ms.Length));
string xml = @"<DuplicateEnumNameTestClass xmlns=""http://schemas.datacontract.org/2004/07/Newtonsoft.Json.Tests.Converters"" xmlns:i=""http://www.w3.org/2001/XMLSchema-instance""> string xml = @"<DuplicateEnumNameTestClass xmlns=""http://schemas.datacontract.org/2004/07/Newtonsoft.Json.Tests.Converters"" xmlns:i=""http://www.w3.org/2001/XMLSchema-instance"">
<Value>foo_bar</Value> <Value>foo_bar</Value>
@@ -67,6 +67,7 @@ namespace Newtonsoft.Json.Tests.Linq
counts[s] = c; counts[s] = c;
} }
#if !NETFX_CORE
[Test] [Test]
public void DeserializeLargeDynamic() public void DeserializeLargeDynamic()
{ {
@@ -100,6 +101,7 @@ namespace Newtonsoft.Json.Tests.Linq
Console.WriteLine("Time (secs): " + sw.Elapsed.TotalSeconds); Console.WriteLine("Time (secs): " + sw.Elapsed.TotalSeconds);
} }
#endif
[Test] [Test]
public void JObjectPropertyNames() public void JObjectPropertyNames()