From af2bc0975a62e9acfcf982245a1c865c16fe64d6 Mon Sep 17 00:00:00 2001
From: Eirik Tsarpalis <eirik.tsarpalis@gmail.com>
Date: Wed, 23 Apr 2025 18:55:57 +0300
Subject: [PATCH 1/2] Account for CompilationMappingAttribute supporting
 multiple declarations.

---
 .../Metadata/FSharpCoreReflectionProxy.cs     |  7 +++++--
 .../RecordTests.fs                            | 19 +++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/FSharpCoreReflectionProxy.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/FSharpCoreReflectionProxy.cs
index e0bd83a0c1c9bf..835da6e002f905 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/FSharpCoreReflectionProxy.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Metadata/FSharpCoreReflectionProxy.cs
@@ -204,7 +204,10 @@ public Func<IEnumerable<Tuple<TKey, TValue>>, TFSharpMap> CreateFSharpMapConstru
         }
 
         private Attribute? GetFSharpCompilationMappingAttribute(Type type)
-            => type.GetCustomAttribute(_compilationMappingAttributeType, inherit: true);
+        {
+            object[] attributes = type.GetCustomAttributes(_compilationMappingAttributeType, inherit: false);
+            return attributes.Length == 0 ? null : (Attribute)attributes[0];
+        }
 
         private SourceConstructFlags GetSourceConstructFlags(Attribute compilationMappingAttribute)
             => _sourceConstructFlagsGetter is null ? SourceConstructFlags.None : (SourceConstructFlags)_sourceConstructFlagsGetter.Invoke(compilationMappingAttribute, null)!;
@@ -212,7 +215,7 @@ private SourceConstructFlags GetSourceConstructFlags(Attribute compilationMappin
         // If the provided type is generated by the F# compiler, returns the runtime FSharp.Core assembly.
         private static Assembly? GetFSharpCoreAssembly(Type type)
         {
-            foreach (Attribute attr in type.GetCustomAttributes(inherit: true))
+            foreach (Attribute attr in type.GetCustomAttributes(inherit: false))
             {
                 Type attributeType = attr.GetType();
                 if (attributeType.FullName == CompilationMappingAttributeTypeName)
diff --git a/src/libraries/System.Text.Json/tests/System.Text.Json.FSharp.Tests/RecordTests.fs b/src/libraries/System.Text.Json/tests/System.Text.Json.FSharp.Tests/RecordTests.fs
index d9ac41cbd2b41d..6044b692904ef4 100644
--- a/src/libraries/System.Text.Json/tests/System.Text.Json.FSharp.Tests/RecordTests.fs
+++ b/src/libraries/System.Text.Json/tests/System.Text.Json.FSharp.Tests/RecordTests.fs
@@ -76,3 +76,22 @@ let ``Recursive struct records are supported``() =
     Assert.Equal("""{"Next":[{"Next":[null]}]}""", json)
     let deserializedValue = JsonSerializer.Deserialize<RecursiveStructRecord>(json)
     Assert.Equal(value, deserializedValue)
+
+
+[<JsonDerivedType(typeof<DerivedClass>, "derived")>]
+type BaseClass(x : int) =
+    member _.X = x
+
+and DerivedClass(x : int, y : bool) = 
+    inherit BaseClass(x)
+    member _.Y = y
+
+[<Fact>]
+let ``Support F# class hierarchies`` () =
+    let value = DerivedClass(42, true) :> BaseClass
+    let json = JsonSerializer.Serialize(value)
+    Assert.Equal("""{"$type":"derived","Y":true,"X":42}""", json)
+    let deserializedValue = JsonSerializer.Deserialize<BaseClass>(json)
+    let derived = Assert.IsType<DerivedClass>(deserializedValue)
+    Assert.Equal(42, deserializedValue.X)
+    Assert.Equal(true, derived.Y)

From 0ab2067a3a326d15359a1b03323f810e9f13b983 Mon Sep 17 00:00:00 2001
From: Eirik Tsarpalis <eirik.tsarpalis@gmail.com>
Date: Thu, 8 May 2025 15:21:52 +0300
Subject: [PATCH 2/2] Update package version

---
 src/libraries/System.Text.Json/src/System.Text.Json.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
index fb8f4321a63b92..72aa247909efd2 100644
--- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj
+++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
@@ -8,8 +8,8 @@
     <NoWarn>CS8969</NoWarn>
     <IncludeInternalObsoleteAttribute>true</IncludeInternalObsoleteAttribute>
     <IsPackable>true</IsPackable>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <ServicingVersion>5</ServicingVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <ServicingVersion>6</ServicingVersion>
     <PackageDescription>Provides high-performance and low-allocating types that serialize objects to JavaScript Object Notation (JSON) text and deserialize JSON text to objects, with UTF-8 support built-in. Also provides types to read and write JSON text encoded as UTF-8, and to create an in-memory document object model (DOM), that is read-only, for random access of the JSON elements within a structured view of the data.
 
 The System.Text.Json library is built-in as part of the shared framework in .NET Runtime. The package can be installed when you need to use it in other target frameworks.</PackageDescription>