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

Src/Newtonsoft.Json.Tests/Converters/StringEnumConverterTests.cs

@@ -491,7 +491,7 @@ namespace Newtonsoft.Json.Tests.Converters
                     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"">
     <Value>foo_bar</Value>

Src/Newtonsoft.Json.Tests/Linq/DynamicTests.cs

@@ -67,6 +67,7 @@ namespace Newtonsoft.Json.Tests.Linq
             counts[s] = c;
         }
 
+#if !NETFX_CORE
         [Test]
         public void DeserializeLargeDynamic()
         {
@@ -100,6 +101,7 @@ namespace Newtonsoft.Json.Tests.Linq
 
             Console.WriteLine("Time (secs): " + sw.Elapsed.TotalSeconds);
         }
+#endif
 
         [Test]
         public void JObjectPropertyNames()