huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgraded Json.Net version to 10.0.1

This commit is contained in:
Kiran Challa 2017-03-28 10:22:13 -07:00 committed by Kiran Challa
parent d21af1f26d
commit 9c5b33dd8a
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.props
View File

@ -3,7 +3,7 @@
<AspNetCoreVersion>1.2.0-*</AspNetCoreVersion> <AspNetCoreVersion>1.2.0-*</AspNetCoreVersion>
<CoreFxVersion>4.3.0</CoreFxVersion> <CoreFxVersion>4.3.0</CoreFxVersion>
<DependencyModelVersion>1.1.0</DependencyModelVersion> <DependencyModelVersion>1.1.0</DependencyModelVersion>
<JsonNetVersion>9.0.1</JsonNetVersion> <JsonNetBsonVersion>1.0.1</JsonNetBsonVersion>
<MoqVersion>4.6.36-alpha</MoqVersion> <MoqVersion>4.6.36-alpha</MoqVersion>
<NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion> <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
<RazorCodeAnalysisVersion>1.0.0-*</RazorCodeAnalysisVersion> <RazorCodeAnalysisVersion>1.0.0-*</RazorCodeAnalysisVersion>

6
src/Microsoft.AspNetCore.Mvc.ViewFeatures/Internal/TempDataSerializer.cs
View File

@ -48,9 +48,9 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
Dictionary<string, object> tempDataDictionary = null; Dictionary<string, object> tempDataDictionary = null;
using (var memoryStream = new MemoryStream(value)) 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) if (tempDataDictionary == null)
{ {
return new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase); return new Dictionary<string, object>(StringComparer.OrdinalIgnoreCase);
@ -145,7 +145,7 @@ namespace Microsoft.AspNetCore.Mvc.ViewFeatures.Internal
using (var memoryStream = new MemoryStream()) using (var memoryStream = new MemoryStream())
{ {
using (var writer = new BsonWriter(memoryStream)) using (var writer = new BsonDataWriter(memoryStream))
{ {
_jsonSerializer.Serialize(writer, values); _jsonSerializer.Serialize(writer, values);
return memoryStream.ToArray(); return memoryStream.ToArray();

2
src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
View File

@ -30,7 +30,7 @@ Microsoft.AspNetCore.Mvc.ViewComponent</Description>
<PackageReference Include="Microsoft.Extensions.PropertyActivator.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" /> <PackageReference Include="Microsoft.Extensions.PropertyActivator.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" /> <PackageReference Include="Microsoft.Extensions.PropertyHelper.Sources" Version="$(AspNetCoreVersion)" PrivateAssets="All" />
<PackageReference Include="Microsoft.Extensions.WebEncoders" Version="$(AspNetCoreVersion)" /> <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.Buffers" Version="$(CoreFxVersion)" />
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="$(CoreFxVersion)" /> <PackageReference Include="System.Runtime.Serialization.Primitives" Version="$(CoreFxVersion)" />
</ItemGroup> </ItemGroup>