From 9c5b33dd8ab48674590d4f6a5e01ccc6a1558b45 Mon Sep 17 00:00:00 2001
From: Kiran Challa <kichalla@microsoft.com>
Date: Tue, 28 Mar 2017 10:22:13 -0700
Subject: [PATCH] Upgraded Json.Net version to 10.0.1

---
 build/dependencies.props                                    | 2 +-
 .../Internal/TempDataSerializer.cs                          | 6 +++---
 .../Microsoft.AspNetCore.Mvc.ViewFeatures.csproj            | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 58bd358063..ef30a5f7b0 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -3,7 +3,7 @@
     <AspNetCoreVersion>1.2.0-*</AspNetCoreVersion>
     <CoreFxVersion>4.3.0</CoreFxVersion>
     <DependencyModelVersion>1.1.0</DependencyModelVersion>
-    <JsonNetVersion>9.0.1</JsonNetVersion>
+    <JsonNetBsonVersion>1.0.1</JsonNetBsonVersion>
     <MoqVersion>4.6.36-alpha</MoqVersion>
     <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
     <RazorCodeAnalysisVersion>1.0.0-*</RazorCodeAnalysisVersion>
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataSerializer.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataSerializer.cs
index 78cb43a100..65230e958e 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataSerializer.cs
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataSerializer.cs
@@ -48,9 +48,9 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
             Dictionary<string, object> tempDataDictionary = null;
 
             using (var memoryStream = new MemoryStream(value))
-            using (var writer = new BsonReader(memoryStream))
+            using (var reader = new BsonDataReader(memoryStream))
             {
-                tempDataDictionary = _jsonSerializer.Deserialize<Dictionary<string, object>>(writer);
+                tempDataDictionary = _jsonSerializer.Deserialize<Dictionary<string, object>>(reader);
                 if (tempDataDictionary == null)
                 {
                     return new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
@@ -145,7 +145,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
 
                 using (var memoryStream = new MemoryStream())
                 {
-                    using (var writer = new BsonWriter(memoryStream))
+                    using (var writer = new BsonDataWriter(memoryStream))
                     {
                         _jsonSerializer.Serialize(writer, values);
                         return memoryStream.ToArray();
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
index 794e8e0ace..b83457cce7 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
@@ -30,7 +30,7 @@ Microsoft.AspNetCore.Mvc.ViewComponent</Description>
     <PackageReference Include="Microsoft.Extensions.PropertyActivator.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Newtonsoft.Json" Version="$(JsonNetVersion)" />
+    <PackageReference Include="Newtonsoft.Json.Bson" Version="$(JsonNetBsonVersion)" />
     <PackageReference Include="System.Buffers" Version="$(CoreFxVersion)" />
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="$(CoreFxVersion)" />
   </ItemGroup>