-Documentation

Src/Newtonsoft.Json.TestConsole/Properties/AssemblyInfo.cs

@@ -57,4 +57,4 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 [assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.1.18329")]
+[assembly: AssemblyFileVersion("7.0.1.18402")]

Src/Newtonsoft.Json.Tests/Documentation/Samples/Json/ReadMultipleContentWithJsonReader.cs

@@ -0,0 +1,90 @@
+#region License
+// Copyright (c) 2007 James Newton-King
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+
+#if NETFX_CORE
+using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
+using TestFixture = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestClassAttribute;
+using Test = Microsoft.VisualStudio.TestPlatform.UnitTestFramework.TestMethodAttribute;
+#elif ASPNETCORE50
+using Xunit;
+using Test = Xunit.FactAttribute;
+using Assert = Newtonsoft.Json.Tests.XUnitAssert;
+#else
+using NUnit.Framework;
+#endif
+
+namespace Newtonsoft.Json.Tests.Documentation.Samples.Json
+{
+    public class ReadMultipleContentWithJsonReader
+    {
+        #region Types
+        public class Role
+        {
+            public string Name { get; set; }
+        }
+        #endregion
+
+        public void Example()
+        {
+            #region Usage
+            string json = @"{ 'name': 'Admin' }{ 'name': 'Publisher' }";
+
+            IList<Role> roles = new List<Role>();
+
+            JsonTextReader reader = new JsonTextReader(new StringReader(json));
+            reader.SupportMultipleContent = true;
+
+            while (true)
+            {
+                if (!reader.Read())
+                    break;
+
+                JsonSerializer serializer = new JsonSerializer();
+                Role role = serializer.Deserialize<Role>(reader);
+
+                roles.Add(role);
+            }
+
+            foreach (Role role in roles)
+            {
+                Console.WriteLine(role.Name);
+            }
+
+            // Admin
+            // Publisher
+            #endregion
+
+            Assert.AreEqual(2, roles.Count);
+            Assert.AreEqual("Admin", roles[0].Name);
+            Assert.AreEqual("Publisher", roles[1].Name);
+        }
+    }
+}

Src/Newtonsoft.Json.Tests/Newtonsoft.Json.Tests.csproj

@@ -93,6 +93,7 @@
     <Compile Include="Documentation\Samples\Bson\DeserializeFromBsonCollection.cs" />
     <Compile Include="Documentation\Samples\Bson\SerializeToBson.cs" />
     <Compile Include="Documentation\Samples\Json\CustomJsonWriter.cs" />
+    <Compile Include="Documentation\Samples\Json\ReadMultipleContentWithJsonReader.cs" />
     <Compile Include="Documentation\Samples\Json\ReadJsonWithJsonTextReader.cs" />
     <Compile Include="Documentation\Samples\Json\CustomJsonReader.cs" />
     <Compile Include="Documentation\Samples\Json\WriteJsonWithJsonTextWriter.cs" />

Src/Newtonsoft.Json.Tests/Properties/AssemblyInfo.cs

@@ -76,4 +76,4 @@ using System.Security;
 // by using the '*' as shown below:
 
 [assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.1.18329")]
+[assembly: AssemblyFileVersion("7.0.1.18402")]

Src/Newtonsoft.Json/Properties/AssemblyInfo.cs

@@ -92,5 +92,5 @@ using System.Security;
 // by using the '*' as shown below:
 
 [assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.1.18329")]
+[assembly: AssemblyFileVersion("7.0.1.18402")]
 [assembly: CLSCompliant(true)]