Adds more features back that were lost due to the removal of Newtonsoft

src/OrchardCore/OrchardCore.Abstractions/Json/Dynamic/JsonDynamicArray.cs

@@ -5,13 +5,15 @@
 using System.Linq;
 using System.Reflection;
 using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
 
 #nullable enable
 
 namespace System.Text.Json.Dynamic;
 
 [DebuggerDisplay("JsonDynamicArray[{Count}]")]
-public class JsonDynamicArray : DynamicObject, IEnumerable<object?>, IEnumerable<JsonNode?>
+[JsonConverter(typeof(JsonDynamicJsonConverter<JsonDynamicArray>))]
+public sealed class JsonDynamicArray : JsonDynamicBase, IEnumerable<object?>, IEnumerable<JsonNode?>
 {
     private readonly JsonArray _jsonArray;
     private readonly Dictionary<int, object?> _dictionary = [];
@@ -22,6 +24,8 @@ public class JsonDynamicArray : DynamicObject, IEnumerable<object?>, IEnumerable
 
     public int Count => _jsonArray.Count;
 
+    public override JsonNode Node => _jsonArray;
+
     public object? this[int index]
     {
         get => GetValue(index);
@@ -140,7 +144,7 @@ public void SetValue(int index, object? value)
         }
     }
 
-    IEnumerator<JsonNode?> IEnumerable<JsonNode?>.GetEnumerator() 
+    IEnumerator<JsonNode?> IEnumerable<JsonNode?>.GetEnumerator()
         => _jsonArray.AsEnumerable().GetEnumerator();
 
     IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();

src/OrchardCore/OrchardCore.Abstractions/Json/Dynamic/JsonDynamicBase.cs

@@ -0,0 +1,13 @@
+using System.Dynamic;
+using System.Text.Json.Nodes;
+
+#nullable enable
+
+namespace System.Text.Json.Dynamic;
+
+public abstract class JsonDynamicBase : DynamicObject
+{
+    public abstract JsonNode? Node { get; }
+
+    public T? ToObject<T>() => Node.ToObject<T>();
+}

src/OrchardCore/OrchardCore.Abstractions/Json/Dynamic/JsonDynamicObject.cs

@@ -3,17 +3,18 @@
 using System.Dynamic;
 using System.Reflection;
 using System.Text.Json.Nodes;
+using System.Text.Json.Serialization;
 using System.Text.Json.Settings;
 
 #nullable enable
 
 namespace System.Text.Json.Dynamic;
 
 [DebuggerDisplay("JsonDynamicObject[{Count}]")]
-public class JsonDynamicObject : DynamicObject
+[JsonConverter(typeof(JsonDynamicJsonConverter<JsonDynamicObject>))]
+public sealed class JsonDynamicObject : JsonDynamicBase
 {
     private readonly JsonObject _jsonObject;
-
     private readonly Dictionary<string, object?> _dictionary = [];
 
     public JsonDynamicObject()
@@ -28,17 +29,19 @@ public JsonDynamicObject(JsonObject jsonObject)
 
     public int Count => _jsonObject.Count;
 
-    public void Merge(JsonNode? content, JsonMergeSettings? settings = null)
-    {
-        _jsonObject.Merge(content, settings);
-    }
+    public override JsonNode Node => _jsonObject;
 
     public object? this[string key]
     {
         get => GetValue(key);
         set => SetValue(key, value);
     }
 
+    public void Merge(JsonNode? content, JsonMergeSettings? settings = null)
+    {
+        _jsonObject.Merge(content, settings);
+    }
+
     public override bool TryGetMember(GetMemberBinder binder, out object? result)
     {
         if (binder.Name == "{No Member}")