Merge Newtonsoft.Json 8.0.1

Author: veblush

README.md

@@ -27,7 +27,7 @@ when you use official Json.NET dll targetting .NET 3.5 Framework.
 
 Following works are done to make Json.NET support Unity3D.
 
- - Based on Newtonsoft Json.NET 7.0.1.
+ - Based on Newtonsoft Json.NET 8.0.1.
  - Disable IL generation to work well under AOT environment like iOS.
  - Remove code related with System.ComponentModel.
  - Remove System.Data and EntityKey support.

src/Newtonsoft.Json.Tests/Bson/BsonReaderTests.cs

@@ -920,7 +920,9 @@ public void ReadLargeStrings()
             for (int i = 0; i < 100; i++)
             {
                 if (i > 0)
+                {
                     largeStringBuilder.Append("-");
+                }
 
                 largeStringBuilder.Append(i.ToString(CultureInfo.InvariantCulture));
             }
@@ -1606,6 +1608,7 @@ public class MyBinder : DefaultSerializationBinder
 
 #if !(NET20 || NET35)
             public bool BindToNameCalled { get; set; }
+
             public override void BindToName(Type serializedType, out string assemblyName, out string typeName)
             {
                 BindToNameCalled = true;
@@ -1677,7 +1680,7 @@ public void GuidsShouldBeProperlyDeserialised()
             BsonReader reader = new BsonReader(new MemoryStream(bytes));
             Assert.IsTrue(reader.Read());
             Assert.IsTrue(reader.Read());
-            
+
             Assert.IsTrue(reader.Read());
             Assert.AreEqual(JsonToken.Bytes, reader.TokenType);
             Assert.AreEqual(typeof(Guid), reader.ValueType);

src/Newtonsoft.Json.Tests/Bson/BsonWriterTests.cs

@@ -301,7 +301,9 @@ public void WriteLargeStrings()
             for (int i = 0; i < 100; i++)
             {
                 if (i > 0)
+                {
                     largeStringBuilder.Append("-");
+                }
 
                 largeStringBuilder.Append(i.ToString(CultureInfo.InvariantCulture));
             }
@@ -483,7 +485,6 @@ public void Example()
             // 6D-61-6C-6C-00-02-31-00-07-00-00-00-4D-65-64-69-75-6D-
             // 00-02-32-00-06-00-00-00-4C-61-72-67-65-00-00-00
 
-
             ms.Seek(0, SeekOrigin.Begin);
 
             // deserialize product from BSON
@@ -493,7 +494,6 @@ public void Example()
             Console.WriteLine(deserializedProduct.Name);
             // Carlos' Spicy Wieners
 
-
             Assert.AreEqual("Carlos' Spicy Wieners", deserializedProduct.Name);
             Assert.AreEqual(9.95m, deserializedProduct.Price);
             Assert.AreEqual(3, deserializedProduct.Sizes.Length);
@@ -745,10 +745,7 @@ public void SerializeByteArray_ErrorWhenTopLevel()
 
             BsonWriter writer = new BsonWriter(ms);
 
-            ExceptionAssert.Throws<JsonWriterException>(() =>
-            {
-                serializer.Serialize(writer, b);
-            }, "Error writing Binary value. BSON must start with an Object or Array. Path ''.");
+            ExceptionAssert.Throws<JsonWriterException>(() => { serializer.Serialize(writer, b); }, "Error writing Binary value. BSON must start with an Object or Array. Path ''.");
         }
 
         public class GuidTestClass

src/Newtonsoft.Json.Tests/Converters/BinaryConverterTests.cs

@@ -43,6 +43,7 @@
 using Assert = Newtonsoft.Json.Tests.XUnitAssert;
 #else
 using NUnit.Framework;
+
 #endif
 
 namespace Newtonsoft.Json.Tests.Converters

src/Newtonsoft.Json.Tests/Converters/CustomCreationConverterTests.cs

@@ -36,6 +36,7 @@
 using Assert = Newtonsoft.Json.Tests.XUnitAssert;
 #else
 using NUnit.Framework;
+
 #endif
 
 namespace Newtonsoft.Json.Tests.Converters