Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitc579ddf

Browse files
authored
NetCore - Use JsonSerializer.Deserialize(Stream) (#5146)
1 parent185d496 commitc579ddf

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

‎CefSharp.Core/DevTools/DevToolsClient.cs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ void IDevToolsMessageObserver.OnDevToolsMethodResult(IBrowser browser, int messa
331331

332332
/// <summary>
333333
/// Deserialize the JSON stream into a .Net object.
334-
/// For .NetCore/.Net 5.0 uses System.Text.Json
334+
/// For .Net6.0 uses System.Text.Json
335335
/// for .Net 4.6.2 uses System.Runtime.Serialization.Json
336336
/// </summary>
337337
/// <typeparam name="T">Object type</typeparam>
@@ -358,7 +358,7 @@ private static T DeserializeJsonEvent<T>(string eventName, Stream stream) where
358358

359359
/// <summary>
360360
/// Deserialize the JSON stream into a .Net object.
361-
/// For .NetCore/.Net 5.0 uses System.Text.Json
361+
/// For .Net6.0 uses System.Text.Json
362362
/// for .Net 4.6.2 uses System.Runtime.Serialization.Json
363363
/// </summary>
364364
/// <typeparam name="T">Object type</typeparam>
@@ -373,7 +373,7 @@ private static T DeserializeJson<T>(Stream stream)
373373
privatestaticreadonlySystem.Text.Json.JsonSerializerOptionsDefaultJsonSerializerOptions=newSystem.Text.Json.JsonSerializerOptions
374374
{
375375
PropertyNameCaseInsensitive=true,
376-
IgnoreNullValues=true,
376+
DefaultIgnoreCondition=System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull,
377377
Converters={newCefSharp.Internals.Json.JsonEnumConverterFactory()},
378378
};
379379
#else
@@ -385,7 +385,7 @@ private static T DeserializeJson<T>(Stream stream)
385385

386386
/// <summary>
387387
/// Deserialize the JSON stream into a .Net object.
388-
/// For .NetCore/.Net 5.0 uses System.Text.Json
388+
/// For .Net6.0 uses System.Text.Json
389389
/// for .Net 4.6.2 uses System.Runtime.Serialization.Json
390390
/// </summary>
391391
/// <param name="type">Object type</param>
@@ -394,11 +394,7 @@ private static T DeserializeJson<T>(Stream stream)
394394
privatestaticobjectDeserializeJson(Typetype,Streamstream)
395395
{
396396
#ifNETCOREAPP
397-
// TODO: use synchronus Deserialize<T>(Stream) when System.Text.Json gets updated
398-
varmemoryStream=newMemoryStream((int)stream.Length);
399-
stream.CopyTo(memoryStream);
400-
401-
returnSystem.Text.Json.JsonSerializer.Deserialize(memoryStream.ToArray(),type,DefaultJsonSerializerOptions);
397+
returnSystem.Text.Json.JsonSerializer.Deserialize(stream,type,DefaultJsonSerializerOptions);
402398
#else
403399
vardcs=newSystem.Runtime.Serialization.Json.DataContractJsonSerializer(type,DefaultJsonSerializerSettings);
404400
returndcs.ReadObject(stream);

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp