Depend on System.Text.Json 6.0

Author: Tarmil

paket.dependencies

@@ -5,7 +5,7 @@ source https://api.nuget.org/v3/index.json
 nuget FSharp.Core >= 4.7.0 lowest_matching:true
 nuget Microsoft.SourceLink.GitHub prerelease copy_local:true
 nuget Nerdbank.GitVersioning copy_local:true
-nuget System.Text.Json >= 4.6.0 lowest_matching: true
+nuget System.Text.Json >= 6.0 lowest_matching: true
 
 group test
 framework net6.0
@@ -15,7 +15,7 @@ source https://api.nuget.org/v3/index.json
 nuget FSharp.Core >= 5.0
 nuget FsCheck.XUnit
 nuget Microsoft.NET.Test.Sdk ~> 16.3.0
-nuget System.Text.Json >= 6.0 prerelease
+nuget System.Text.Json >= 6.0
 nuget xunit ~> 2.4.0
 nuget xunit.runner.visualstudio ~> 2.4.0
 nuget BenchmarkDotNet
@@ -27,7 +27,7 @@ storage none
 source https://api.nuget.org/v3/index.json
 
 nuget FSharp.Core >= 5.0
-nuget System.Text.Json >= 5.0
+nuget System.Text.Json >= 6.0
 nuget FsCheck.XUnit
 nuget xunit ~> 2.4.0
 nuget xunit.console ~> 2.4.0

paket.lock

@@ -3,7 +3,7 @@ RESTRICTION: == netstandard2.0
 NUGET
   remote: https://api.nuget.org/v3/index.json
     FSharp.Core (4.7)
-    Microsoft.Bcl.AsyncInterfaces (5.0)
+    Microsoft.Bcl.AsyncInterfaces (6.0)
       System.Threading.Tasks.Extensions (>= 4.5.4)
     Microsoft.Build.Tasks.Git (1.1.0-beta-21055-01) - copy_local: true
     Microsoft.SourceLink.Common (1.1.0-beta-21055-01) - copy_local: true
@@ -17,18 +17,19 @@ NUGET
       System.Numerics.Vectors (>= 4.4)
       System.Runtime.CompilerServices.Unsafe (>= 4.5.3)
     System.Numerics.Vectors (4.5)
-    System.Runtime.CompilerServices.Unsafe (5.0)
-    System.Text.Encodings.Web (5.0.1)
+    System.Runtime.CompilerServices.Unsafe (6.0)
+    System.Text.Encodings.Web (6.0)
+      System.Buffers (>= 4.5.1)
+      System.Memory (>= 4.5.4)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
+    System.Text.Json (6.0)
+      Microsoft.Bcl.AsyncInterfaces (>= 6.0)
       System.Buffers (>= 4.5.1)
       System.Memory (>= 4.5.4)
-    System.Text.Json (4.6)
-      Microsoft.Bcl.AsyncInterfaces (>= 1.0)
-      System.Buffers (>= 4.5)
-      System.Memory (>= 4.5.3)
       System.Numerics.Vectors (>= 4.5)
-      System.Runtime.CompilerServices.Unsafe (>= 4.6)
-      System.Text.Encodings.Web (>= 4.6)
-      System.Threading.Tasks.Extensions (>= 4.5.2)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
+      System.Text.Encodings.Web (>= 6.0)
+      System.Threading.Tasks.Extensions (>= 4.5.4)
     System.Threading.Tasks.Extensions (4.5.4)
       System.Runtime.CompilerServices.Unsafe (>= 4.5.3)
 
@@ -131,18 +132,18 @@ NUGET
     System.Reflection.Emit (4.7)
     System.Reflection.Emit.Lightweight (4.7)
     System.Reflection.Metadata (5.0)
-    System.Runtime.CompilerServices.Unsafe (6.0.0-rc.2.21480.5)
+    System.Runtime.CompilerServices.Unsafe (6.0)
     System.Security.AccessControl (5.0)
       Microsoft.NETCore.Platforms (>= 5.0)
       System.Security.Principal.Windows (>= 5.0)
     System.Security.Principal.Windows (5.0)
     System.Text.Encoding.CodePages (5.0)
       Microsoft.NETCore.Platforms (>= 5.0)
-    System.Text.Encodings.Web (6.0.0-rc.2.21480.5)
-      System.Runtime.CompilerServices.Unsafe (>= 6.0.0-rc.2.21480.5)
-    System.Text.Json (6.0.0-rc.2.21480.5)
-      System.Runtime.CompilerServices.Unsafe (>= 6.0.0-rc.2.21480.5)
-      System.Text.Encodings.Web (>= 6.0.0-rc.2.21480.5)
+    System.Text.Encodings.Web (6.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
+    System.Text.Json (6.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
+      System.Text.Encodings.Web (>= 6.0)
     System.Threading.Tasks.Extensions (4.5.4)
     System.ValueTuple (4.5)
     xunit (2.4.1)
@@ -211,6 +212,7 @@ NUGET
     System.Runtime (4.3.1)
       Microsoft.NETCore.Platforms (>= 1.1.1)
       Microsoft.NETCore.Targets (>= 1.1.3)
+    System.Runtime.CompilerServices.Unsafe (6.0)
     System.Runtime.Loader (4.3)
       System.IO (>= 4.3)
       System.Reflection (>= 4.3)
@@ -219,7 +221,11 @@ NUGET
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
       System.Runtime (>= 4.3)
-    System.Text.Json (5.0.2)
+    System.Text.Encodings.Web (6.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
+    System.Text.Json (6.0)
+      System.Runtime.CompilerServices.Unsafe (>= 6.0)
+      System.Text.Encodings.Web (>= 6.0)
     System.Threading.Tasks (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)

src/FSharp.SystemTextJson/Collection.fs

@@ -48,7 +48,7 @@ type JsonSetConverter<'T when 'T : comparison>(fsOptions) =
     let tIsNullable = isNullableFieldType fsOptions tType
     let needsNullChecking = not tIsNullable && not tType.IsValueType
 
-    let rec read (acc: Set<'T>) (reader: byref<Utf8JsonReader>) options =
+    let rec read (acc: Set<'T>) (reader: byref<Utf8JsonReader>) (options: JsonSerializerOptions) =
         if not (reader.Read()) then acc else
         match reader.TokenType with
         | JsonTokenType.EndArray -> acc
@@ -93,7 +93,7 @@ type JsonStringMapConverter<'V>() =
 
     let ty = typeof<Map<string, 'V>>
 
-    let rec read (acc: Map<string, 'V>) (reader: byref<Utf8JsonReader>) options =
+    let rec read (acc: Map<string, 'V>) (reader: byref<Utf8JsonReader>) (options: JsonSerializerOptions) =
         if not (reader.Read()) then acc else
         match reader.TokenType with
         | JsonTokenType.EndObject -> acc
@@ -129,7 +129,7 @@ type JsonWrappedStringMapConverter<'K, 'V when 'K : comparison>() =
     let wrap = FSharpValue.PreComputeUnionConstructor(case, true)
     let unwrap = FSharpValue.PreComputeUnionReader(case, true)
 
-    let rec read (acc: Map<'K, 'V>) (reader: byref<Utf8JsonReader>) options =
+    let rec read (acc: Map<'K, 'V>) (reader: byref<Utf8JsonReader>) (options: JsonSerializerOptions) =
         if not (reader.Read()) then acc else
         match reader.TokenType with
         | JsonTokenType.EndObject -> acc
@@ -161,7 +161,7 @@ type JsonMapConverter<'K, 'V when 'K : comparison>() =
 
     let ty = typeof<Map<'K, 'V>>
 
-    let rec read (acc: Map<'K, 'V>) (reader: byref<Utf8JsonReader>) options =
+    let rec read (acc: Map<'K, 'V>) (reader: byref<Utf8JsonReader>) (options: JsonSerializerOptions) =
         if not (reader.Read()) then acc else
         match reader.TokenType with
         | JsonTokenType.EndArray -> acc

src/FSharp.SystemTextJson/Union.fs

@@ -251,7 +251,7 @@ type JsonUnionConverter<'T>
             | true, p -> ValueSome p
             | false, _ -> ValueNone
 
-    let readField (reader: byref<Utf8JsonReader>) (case: Case) (f: Field) options =
+    let readField (reader: byref<Utf8JsonReader>) (case: Case) (f: Field) (options: JsonSerializerOptions) =
         reader.Read() |> ignore
         if f.MustBeNonNull && reader.TokenType = JsonTokenType.Null then
             let msg = sprintf "%s.%s(%s) was expected to be of type %s, but was null." ty.Name case.Name f.Name f.Type.Name
@@ -426,7 +426,7 @@ type JsonUnionConverter<'T>
         writer.WriteStartObject()
         writeFieldsAsRestOfObject writer case value options
 
-    let writeFields writer case value options =
+    let writeFields (writer: Utf8JsonWriter) case value (options: JsonSerializerOptions) =
         if case.UnwrappedSingleField then
             JsonSerializer.Serialize(writer, (case.Dector value).[0], case.Fields.[0].Type, options)
         elif namedFields then