Use RC1 version of System.Text.Json

Turnerj · Turnerj · commit 566bc126f747 · 2021-09-20T17:14:24.000+09:30
diff --git a/Source/Common/ValuesJsonConverter.cs b/Source/Common/ValuesJsonConverter.cs
@@ -185,7 +185,7 @@ public virtual void WriteObject(Utf8JsonWriter writer, object? value, JsonSerial
                         var targetType = targetTypes[i];
                         if (targetType.IsAssignableFrom(explicitType))
                         {
-                            return ProcessObject(objectRoot, explicitType!, options);
+                            return objectRoot.Deserialize(explicitType!, options);
                         }
                     }
                 }
@@ -208,7 +208,7 @@ public virtual void WriteObject(Utf8JsonWriter writer, object? value, JsonSerial
                                 localTargetType = concreteType!;
                             }
 
-                            return ProcessObject(objectRoot, localTargetType, options);
+                            return objectRoot.Deserialize(localTargetType, options);
                         }
 #pragma warning disable CA1031 // Do not catch general exception types
                         catch (Exception ex)
@@ -473,13 +473,5 @@ private static bool TryGetConcreteType(
 #pragma warning restore CA1031 // Do not catch general exception types
             }
         }
-
-        private static object? ProcessObject(JsonElement element, Type objectType, JsonSerializerOptions options)
-        {
-            // TODO: Investigate avoiding the string allocation
-            // Related issue: https://github.com/dotnet/runtime/issues/31274
-            var json = element.GetRawText();
-            return JsonSerializer.Deserialize(json, objectType ?? typeof(object), options);
-        }
     }
 }
diff --git a/Source/Schema.NET.Pending/Schema.NET.Pending.csproj b/Source/Schema.NET.Pending/Schema.NET.Pending.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="System.Text.Json" Version="6.0.0-preview.7.21377.19" />
+    <PackageReference Include="System.Text.Json" Version="6.0.0-rc.1.21451.13" />
     <PackageReference Include="System.Memory" Version="4.5.4" />
     <ProjectReference Include="../../Tools/Schema.NET.Tool/Schema.NET.Tool.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
diff --git a/Source/Schema.NET/Schema.NET.csproj b/Source/Schema.NET/Schema.NET.csproj
@@ -14,7 +14,7 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="System.Text.Json" Version="6.0.0-preview.7.21377.19" />
+    <PackageReference Include="System.Text.Json" Version="6.0.0-rc.1.21451.13" />
     <PackageReference Include="System.Memory" Version="4.5.4" />
     <ProjectReference Include="../../Tools/Schema.NET.Tool/Schema.NET.Tool.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ public virtual void WriteObject(Utf8JsonWriter writer, object? value, JsonSerial`
`185`	`185`	`var targetType = targetTypes[i];`
`186`	`186`	`if (targetType.IsAssignableFrom(explicitType))`
`187`	`187`	`{`
`188`		`- return ProcessObject(objectRoot, explicitType!, options);`
	`188`	`+ return objectRoot.Deserialize(explicitType!, options);`
`189`	`189`	`}`
`190`	`190`	`}`
`191`	`191`	`}`
`@@ -208,7 +208,7 @@ public virtual void WriteObject(Utf8JsonWriter writer, object? value, JsonSerial`
`208`	`208`	`localTargetType = concreteType!;`
`209`	`209`	`}`
`210`	`210`
`211`		`- return ProcessObject(objectRoot, localTargetType, options);`
	`211`	`+ return objectRoot.Deserialize(localTargetType, options);`
`212`	`212`	`}`
`213`	`213`	`#pragma warning disable CA1031 // Do not catch general exception types`
`214`	`214`	`catch (Exception ex)`
`@@ -473,13 +473,5 @@ private static bool TryGetConcreteType(`
`473`	`473`	`#pragma warning restore CA1031 // Do not catch general exception types`
`474`	`474`	`}`
`475`	`475`	`}`
`476`		`-`
`477`		`- private static object? ProcessObject(JsonElement element, Type objectType, JsonSerializerOptions options)`
`478`		`- {`
`479`		`- // TODO: Investigate avoiding the string allocation`
`480`		`- // Related issue: https://github.com/dotnet/runtime/issues/31274`
`481`		`- var json = element.GetRawText();`
`482`		`- return JsonSerializer.Deserialize(json, objectType ?? typeof(object), options);`
`483`		`- }`
`484`	`476`	`}`
`485`	`477`	`}`