Use RC1 version of System.Text.Json

Turnerj · Turnerj · commit 1ec52c1589e9 · 2021-11-09T21:16:36.000+10:30
diff --git a/Source/Common/ValuesJsonConverter.cs b/Source/Common/ValuesJsonConverter.cs
@@ -201,7 +201,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);
                         }
                     }
                 }
@@ -224,7 +224,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)
@@ -489,13 +489,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
`@@ -201,7 +201,7 @@ public virtual void WriteObject(Utf8JsonWriter writer, object? value, JsonSerial`
`201`	`201`	`var targetType = targetTypes[i];`
`202`	`202`	`if (targetType.IsAssignableFrom(explicitType))`
`203`	`203`	`{`
`204`		`- return ProcessObject(objectRoot, explicitType!, options);`
	`204`	`+ return objectRoot.Deserialize(explicitType!, options);`
`205`	`205`	`}`
`206`	`206`	`}`
`207`	`207`	`}`
`@@ -224,7 +224,7 @@ public virtual void WriteObject(Utf8JsonWriter writer, object? value, JsonSerial`
`224`	`224`	`localTargetType = concreteType!;`
`225`	`225`	`}`
`226`	`226`
`227`		`- return ProcessObject(objectRoot, localTargetType, options);`
	`227`	`+ return objectRoot.Deserialize(localTargetType, options);`
`228`	`228`	`}`
`229`	`229`	`#pragma warning disable CA1031 // Do not catch general exception types`
`230`	`230`	`catch (Exception ex)`
`@@ -489,13 +489,5 @@ private static bool TryGetConcreteType(`
`489`	`489`	`#pragma warning restore CA1031 // Do not catch general exception types`
`490`	`490`	`}`
`491`	`491`	`}`
`492`		`-`
`493`		`- private static object? ProcessObject(JsonElement element, Type objectType, JsonSerializerOptions options)`
`494`		`- {`
`495`		`- // TODO: Investigate avoiding the string allocation`
`496`		`- // Related issue: https://github.com/dotnet/runtime/issues/31274`
`497`		`- var json = element.GetRawText();`
`498`		`- return JsonSerializer.Deserialize(json, objectType ?? typeof(object), options);`
`499`		`- }`
`500`	`492`	`}`
`501`	`493`	`}`