upgrade to .net 9.0.203

pchalamet · pchalamet · commit 8cf1d8ec4d01 · 2025-05-25T20:31:15.000+02:00
diff --git a/.github/workflows/on-push-branch.yml b/.github/workflows/on-push-branch.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4.2.0
         with:
-          dotnet-version: 9.0.200
+          dotnet-version: 9.0.203
   
       - name: Build & Test
         run: make test config=Release
diff --git a/.github/workflows/on-push-tag.yml b/.github/workflows/on-push-tag.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4.2.0
         with:
-          dotnet-version: 9.0.200
+          dotnet-version: 9.0.203
 
       - name: Extract Version Suffix
         run: |
diff --git a/.github/workflows/on-release-published.yml b/.github/workflows/on-release-published.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4.2.0
         with:
-          dotnet-version: 9.0.200
+          dotnet-version: 9.0.203
 
       - name: Download Release artifacts
         uses: robinraju/release-downloader@v1.11
diff --git a/Makefile b/Makefile
@@ -10,3 +10,6 @@ test:
 
 nuget:
 	dotnet pack -c $(config) -p:Version=$(version) -o .out
+
+upgrade:
+	dotnet restore --force-evaluate
diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+    "sdk": {
+      "version": "9.0.203"
+    }
+  }
diff --git a/src/FSharp.MongoDB.Bson/FSharp.MongoDB.Bson.fsproj b/src/FSharp.MongoDB.Bson/FSharp.MongoDB.Bson.fsproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net9.0;net8.0;netstandard2.1</TargetFrameworks>
@@ -26,8 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Bson" Version="3.1.0" />
-    <!-- <ProjectReference Include="../../../mongo-csharp-driver/src/MongoDB.Bson/MongoDB.Bson.csproj" /> -->
+    <PackageReference Include="MongoDB.Bson" Version="3.4.0" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/FSharp.MongoDB.Bson/Serialization/FSharpTypeHelpers.fs b/src/FSharp.MongoDB.Bson/Serialization/FSharpTypeHelpers.fs
@@ -98,5 +98,12 @@ module private Helpers =
     /// <summary>
     /// Maps a member of a <c>BsonClassMap</c> to a nullable value if possible.
     /// </summary>
-    let mapMemberNullable (memberMap: BsonClassMap) (propertyInfo: PropertyInfo) =
-        memberMap.MapMember(propertyInfo) |> ignore
+    let mapMemberNullable (classMap: BsonClassMap) (propertyInfo: PropertyInfo) =
+        let memberMap = classMap.MapMember(propertyInfo)
+#if !NETSTANDARD2_1
+        let nrtInfo = nrtContext.Create(propertyInfo)
+        if nrtInfo.WriteState = NullabilityState.Nullable then
+            memberMap.SetDefaultValue(objnull) |> ignore
+#else
+        ()
+#endif
diff --git a/src/FSharp.MongoDB.Bson/Serialization/Serializers/FSharpOptionSerializer.fs b/src/FSharp.MongoDB.Bson/Serialization/Serializers/FSharpOptionSerializer.fs
@@ -40,4 +40,4 @@ type FSharpOptionSerializer<'T when 'T: not null>() =
 
         match reader.GetCurrentBsonType() with
         | BsonType.Null -> reader.ReadNull(); None
-        | _ -> Some (serializer.Value.Deserialize(context, args))
+        | t -> Some (serializer.Value.Deserialize(context, args))
diff --git a/tests/CSharpDataModels/CSharpDataModels.csproj b/tests/CSharpDataModels/CSharpDataModels.csproj
@@ -1,4 +1,4 @@
-﻿<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>net9.0</TargetFramework>
@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="MongoDB.Bson" Version="3.1.0" />
+        <PackageReference Include="MongoDB.Bson" Version="3.4.0" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/CSharpDataModels/DataModels.cs b/tests/CSharpDataModels/DataModels.cs
@@ -18,25 +18,25 @@ public record PairValue(Pair Value) : Value;
 
 public record RecordDataModel
 {
-    public ObjectId Id { get; init; }
-
-    public required int Int { get; init; }
-    public int? IntOpt { get; init; }
-
-    public required string String { get; init; }
-    public string? StringOpt { get; init; }
-
-    public required int[] Array { get; init; }
-    public int[]? ArrayOpt { get; init; }
-
-    public required Value Value { get; init; }
-    public Value? ValueOpt { get; init; }
-
-    public required Value[] ValueArray { get; init; }
-    public Value[]? ValueArrayOpt { get; init; }
-
-    public required Pair Record { get; init; }
+    // public ObjectId Id { get; init; }
+    //
+    // public required int Int { get; init; }
+    // public int? IntOpt { get; init; }
+    //
+    // public required string String { get; init; }
+    // public string? StringOpt { get; init; }
+    //
+    // public required int[] Array { get; init; }
+    // public int[]? ArrayOpt { get; init; }
+
+    // public required Value Value { get; init; }
+    // public Value? ValueOpt { get; init; }
+
+    // public required Value[] ValueArray { get; init; }
+    // public Value[]? ValueArrayOpt { get; init; }
+
+    // public required Pair Record { get; init; }
     public Pair? RecordOpt { get; init; }
 
-    public required Dictionary<string, int> Map { get; init; }
+    // public required Dictionary<string, int> Map { get; init; }
 }
diff --git a/tests/FSharp.MongoDB.Bson.Tests/FSharp.MongoDB.Bson.Tests.fsproj b/tests/FSharp.MongoDB.Bson.Tests/FSharp.MongoDB.Bson.Tests.fsproj
@@ -1,4 +1,4 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
@@ -20,20 +20,17 @@
     <Compile Include="Isomorphic\IsomorphicTests.fs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MongoDB.Bson" Version="3.1.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\FSharp.MongoDB.Bson\FSharp.MongoDB.Bson.fsproj" />
     <ProjectReference Include="..\CSharpDataModels\CSharpDataModels.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FsUnit" Version="6.0.1" />
-    <PackageReference Include="NUnit" Version="4.2.2" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="FsUnit" Version="7.0.1" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.0" />
+    <PackageReference Include="MongoDB.Bson" Version="3.4.0" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/FSharp.MongoDB.Bson.Tests/Isomorphic/IsomorphicTests.fs b/tests/FSharp.MongoDB.Bson.Tests/Isomorphic/IsomorphicTests.fs
@@ -19,27 +19,29 @@ module IsomorphicSerialization =
 
     [<CLIMutable>]
     type RecordDataModel =
-        { Id: ObjectId
+        {
+          // Id: ObjectId
             
-          Int: int
-          IntOpt: int option
+          // Int: int
+          // IntOpt: int option
+          //
+          // String: string
+          // StringOpt: string option
+          //
+          // Array: int array
+          // ArrayOpt: int array option
+          //
+        //   Value: Value
+        //   ValueOpt: Value option 
           
-          String: string
-          StringOpt: string option
+        //   ValueArray: Value array
+        //   ValueArrayOpt: Value array option
           
-          Array: int array
-          ArrayOpt: int array option
-          
-          Value: Value
-          ValueOpt: Value option 
-          
-          ValueArray: Value array
-          ValueArrayOpt: Value array option
-          
-          Record: Pair
+          // Record: Pair
           RecordOpt: Pair option
           
-          Map: Map<string, int> }
+          // Map: Map<string, int>
+          }
 
     let ModelSome() =
         let csModel = 
@@ -50,38 +52,41 @@ module IsomorphicSerialization =
                 map
             
             RecordDataModel(
-                Id = ObjectId.GenerateNewId(),
-                Int = 42,
-                IntOpt = 666,
-                String = "String",
-                StringOpt = "StringOpt",
-                Array = [| 1; 2; 3 |],
-                ArrayOpt = [| 5; 6; 7; 8 |],
-                Value = CSharpDataModels.Value.IntValue(42),
-                ValueOpt = CSharpDataModels.Value.StringValue("ValueStringOpt"),
-                ValueArray = [| CSharpDataModels.Value.IntValue(42)
-                                CSharpDataModels.Value.StringValue("String")
-                                CSharpDataModels.Value.PairValue(CSharpDataModels.Pair(First = 99, Second = "SecondPair")) |],
-                ValueArrayOpt = [| CSharpDataModels.Value.IntValue(101) |],
-                Record = CSharpDataModels.Pair(First = 1, Second = "Second"),
-                RecordOpt = CSharpDataModels.Pair(First = -1, Second = "SecondOpt"),
-                Map = map)
+                // Id = ObjectId.GenerateNewId(),
+                // Int = 42,
+                // IntOpt = 666,
+                // String = "String",
+                // StringOpt = "StringOpt",
+                // Array = [| 1; 2; 3 |],
+                // ArrayOpt = [| 5; 6; 7; 8 |],
+                // Value = CSharpDataModels.Value.IntValue(42),
+                // ValueOpt = CSharpDataModels.Value.StringValue("ValueStringOpt"),
+                // ValueArray = [| CSharpDataModels.Value.IntValue(42)
+                //                 CSharpDataModels.Value.StringValue("String")
+                //                 CSharpDataModels.Value.PairValue(CSharpDataModels.Pair(First = 99, Second = "SecondPair")) |],
+                // ValueArrayOpt = [| CSharpDataModels.Value.IntValue(101) |],
+                // Record = CSharpDataModels.Pair(First = 1, Second = "Second"),
+                RecordOpt = CSharpDataModels.Pair(First = -1, Second = "SecondOpt")
+                // Map = map
+                )
 
         let fsModel =
-            { Id = csModel.Id
-              Int = 42
-              IntOpt = Some 666
-              String = "String"
-              StringOpt = Some "StringOpt"
-              Array = [| 1; 2; 3 |] 
-              ArrayOpt = Some [| 5; 6; 7; 8 |]
-              Value = Value.IntValue 42
-              ValueOpt = Some <| Value.StringValue "ValueStringOpt"
-              ValueArray = [| Value.IntValue 42; Value.StringValue "String"; Value.PairValue { First = 99; Second = Some "SecondPair" } |]
-              ValueArrayOpt = Some [| Value.IntValue 101 |]
-              Record = { First = 1; Second = Some "Second" }
+            {
+              // Id = csModel.Id
+              // Int = 42
+              // IntOpt = Some 666
+              // String = "String"
+              // StringOpt = Some "StringOpt"
+              // Array = [| 1; 2; 3 |] 
+              // ArrayOpt = Some [| 5; 6; 7; 8 |]
+            //   Value = Value.IntValue 42
+            //   ValueOpt = Some <| Value.StringValue "ValueStringOpt"
+            //   ValueArray = [| Value.IntValue 42; Value.StringValue "String"; Value.PairValue { First = 99; Second = Some "SecondPair" } |]
+            //   ValueArrayOpt = Some [| Value.IntValue 101 |]
+              // Record = { First = 1; Second = Some "Second" }
               RecordOpt = Some { First = -1; Second = Some "SecondOpt" }
-              Map = Map [ "1", 1; "2", 2 ] }
+              // Map = Map [ "1", 1; "2", 2 ]
+              }
 
         csModel, fsModel
 
@@ -94,49 +99,59 @@ module IsomorphicSerialization =
                 map
             
             RecordDataModel(
-                Id = ObjectId.GenerateNewId(),
-                Int = 42,
-                String = "String",
-                Array = [| 1; 2; 3 |],
-                Value = CSharpDataModels.Value.IntValue(42),
-                ValueArray = [| CSharpDataModels.Value.IntValue(42)
-                                CSharpDataModels.Value.StringValue("String")
-                                CSharpDataModels.Value.PairValue(CSharpDataModels.Pair(First = 99, Second = "SecondPair")) |],
-                Record = CSharpDataModels.Pair(First = 1, Second = "Second"),
-                Map = map)
+                // Id = ObjectId.GenerateNewId(),
+                // Int = 42,
+                // String = "String",
+                // Array = [| 1; 2; 3 |],
+                // Value = CSharpDataModels.Value.IntValue(42),
+                // ValueArray = [| CSharpDataModels.Value.IntValue(42)
+                //                 CSharpDataModels.Value.StringValue("String")
+                //                 CSharpDataModels.Value.PairValue(CSharpDataModels.Pair(First = 99, Second = "SecondPair")) |],
+                // Record = CSharpDataModels.Pair(First = 1, Second = "Second"),
+                // Map = map
+                )
 
         let fsModel =
-            { Id = csModel.Id
-              Int = 42
-              IntOpt = None
-              String = "String"
-              StringOpt = None
-              Array = [| 1; 2; 3 |] 
-              ArrayOpt = None
-              Value = Value.IntValue 42
-              ValueOpt = None
-              ValueArray = [| Value.IntValue 42; Value.StringValue "String"; Value.PairValue { First = 99; Second = Some "SecondPair" } |]
-              ValueArrayOpt = None
-              Record = { First = 1; Second = Some "Second" }
+            {
+              // Id = csModel.Id
+              // Int = 42
+              // IntOpt = None
+              // String = "String"
+              // StringOpt = None
+              // Array = [| 1; 2; 3 |] 
+              // ArrayOpt = None
+            //   Value = Value.IntValue 42
+            //   ValueOpt = None
+            //   ValueArray = [| Value.IntValue 42; Value.StringValue "String"; Value.PairValue { First = 99; Second = Some "SecondPair" } |]
+            //   ValueArrayOpt = None
+              // Record = { First = 1; Second = Some "Second" }
               RecordOpt = None
-              Map = Map [ "1", 1; "2", 2 ] }
+              // Map = Map [ "1", 1; "2", 2 ]
+              }
 
         csModel, fsModel
 
     [<Test>]
     let ``Isomorphic Bson Some cs / fs``() =
         let csModel, fsModel = ModelSome()
 
+        // serialization shall be same
         let csDoc = serialize csModel
         let fsDoc = serialize fsModel
-
         csDoc |> should equal fsDoc
 
+        // cross-deserialization shall work
+        let fsModel2 = deserialize<RecordDataModel> csDoc
+        fsModel2 |> should equal fsModel
+
     [<Test>]
     let ``Isomorphic Bson None cs / fs``() =
         let csModel, fsModel = ModelNone()
 
         let csDoc = serialize csModel
         let fsDoc = serialize fsModel
-        
         csDoc |> should equal fsDoc
+
+        // cross-deserialization shall work
+        let fsModel2 = deserialize<RecordDataModel> csDoc
+        fsModel2 |> should equal fsModel

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +    "sdk": {
 +      "version": "9.0.203"
 +    }
 +  }