Migrated to newtonsoft.json to System.Text.Json and .NET 10.x support

CHANGELOG.md

@@ -1,3 +1,11 @@
+### Version: 2.0.0-beta.1
+#### Date: April-27-2026
+- **Breaking:** Replaced **Newtonsoft.Json** with **System.Text.Json** across the package. The `Newtonsoft.Json` package reference is removed; add `System.Text.Json` (or rely on the BCL on supported runtimes) as needed in consuming projects.
+- **Breaking:** Variant metadata APIs that previously took `JObject` / `JArray` now use `System.Text.Json.Nodes.JsonObject` and `JsonArray` (`GetVariantAliases`, `GetVariantMetadataTags`, and obsolete `GetDataCsvariantsAttribute` overloads).
+- JSON serialization uses the same model attributes with `System.Text.Json.Serialization` (`JsonPropertyName`, `JsonConverter`), including custom converters for RTE/GQL-shaped JSON and **path-mapped** embedded models (`PathMappedJsonConverter<T>`).
+- RTE JSON deserialization tolerates **trailing commas** when using the documented test/helper patterns (`AllowTrailingCommas`); attribute dictionaries may surface **`JsonElement`** values instead of boxed strings—use helpers or unwrap explicitly if you access `Node.attrs` directly.
+- Internal: `LangVersion` set to **latest** for multi-target builds; utilities normalize attribute values where the HTML pipeline expects strings.
+
 ### Version: 1.2.0
 #### Date: March-31-2026
 - Added `GetVariantMetadataTags(JObject, string)` and `GetVariantMetadataTags(JArray, string)` as the canonical API for building the `data-csvariants` payload (same behavior as the previous helpers).

Contentstack.Utils.Tests/Contentstack.Utils.Tests.csproj

@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <TargetFrameworks>net10.0</TargetFrameworks>
 
     <IsPackable>false</IsPackable>
     <ReleaseVersion>$(Version)</ReleaseVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageReference Include="coverlet.collector" Version="6.0.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

Contentstack.Utils.Tests/DefaultRenderTest.cs

@@ -5,6 +5,7 @@
 using Contentstack.Utils.Tests.Helpers;
 using Contentstack.Utils.Tests.Constants;
 using System;
+using Contentstack.Utils;
 
 namespace Contentstack.Utils.Tests
 {
@@ -178,9 +179,9 @@ public void testLinkhDocument()
 
             string result = defaultRender.RenderNode("a", nodeLink, (nodes) => { return text; });
 
-            string url = nodeLink.attrs.ContainsKey("url") ? (string)nodeLink.attrs["url"] : "";
-            string target = nodeLink.attrs.ContainsKey("target") ? (string)nodeLink.attrs["target"] : "";
-            string title = nodeLink.attrs.ContainsKey("title") ? (string)nodeLink.attrs["title"] : "";
+            string url = nodeLink.attrs.ContainsKey("url") ? JsonAttrValue.AsString(nodeLink.attrs["url"]) : "";
+            string target = nodeLink.attrs.ContainsKey("target") ? JsonAttrValue.AsString(nodeLink.attrs["target"]) : "";
+            string title = nodeLink.attrs.ContainsKey("title") ? JsonAttrValue.AsString(nodeLink.attrs["title"]) : "";
 
             Assert.Equal($"<a href=\"{url}\"  target=\"{target}\" title=\"{title}\" >Text To set Link</a>", result);
         }

Contentstack.Utils.Tests/Helpers/NodeParser.cs

@@ -1,31 +1,35 @@
-using Contentstack.Utils.Interfaces;
+using System.Text.Json;
+using Contentstack.Utils.Interfaces;
 using Contentstack.Utils.Models;
 using Contentstack.Utils.Tests.Constants;
 using Contentstack.Utils.Tests.Mocks;
-using Newtonsoft.Json;
 
 namespace Contentstack.Utils.Tests.Helpers
 {
     public class NodeParser
     {
-        public static Node parse(string jsonNode)
+        private static readonly JsonSerializerOptions SerializerSettings = new JsonSerializerOptions
         {
-            JsonSerializerSettings SerializerSettings = new JsonSerializerSettings();
-            JsonSerializer Serializer = JsonSerializer.Create(SerializerSettings);
+            AllowTrailingCommas = true,
+        };
 
-            return JsonConvert.DeserializeObject<Node>(jsonNode, SerializerSettings);
+        public static Node parse(string jsonNode)
+        {
+            return JsonSerializer.Deserialize<Node>(jsonNode, SerializerSettings);
         }
     }
+
     public class GQLParser
     {
-        public static GQLModel<T> parse<T>(string jsonNode, string embedConnection = null) where T: IEmbeddedObject
+        private static readonly JsonSerializerOptions SerializerSettings = new JsonSerializerOptions
+        {
+            AllowTrailingCommas = true,
+        };
+
+        public static GQLModel<T> parse<T>(string jsonNode, string embedConnection = null) where T : IEmbeddedObject
         {
             var data = JsonToHtmlConstants.KGQLModel(jsonNode, embedConnection);
-            JsonSerializerSettings SerializerSettings = new JsonSerializerSettings();
-            JsonSerializer Serializer = JsonSerializer.Create(SerializerSettings);
-            return JsonConvert.DeserializeObject<GQLModel<T>>(data, SerializerSettings);
+            return JsonSerializer.Deserialize<GQLModel<T>>(data, SerializerSettings);
         }
     }
-
 }
-

Contentstack.Utils.Tests/Mocks/CustomRenderOptionMock.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Contentstack.Utils;
 using Contentstack.Utils.Interfaces;
 using Contentstack.Utils.Models;
 using HtmlAgilityPack;
@@ -17,9 +18,9 @@ public override string RenderNode(string nodeType, Node node, NodeChildrenCallBa
                 case "a":
                     if (node.attrs.ContainsKey("target"))
                     {
-                        return $"<a href=\"{(string)node.attrs["url"]}\" target=\"{(string)node.attrs["target"]}\">{callBack(node.children)}</a>";
+                        return $"<a href=\"{JsonAttrValue.AsString(node.attrs["url"])}\" target=\"{JsonAttrValue.AsString(node.attrs["target"])}\">{callBack(node.children)}</a>";
                     }
-                    return $"<a href=\"{(string)node.attrs["url"]}\">{callBack(node.children)}</a>";
+                    return $"<a href=\"{JsonAttrValue.AsString(node.attrs["url"])}\">{callBack(node.children)}</a>";
             }
             return base.RenderNode(nodeType, node, callBack);
         }

Contentstack.Utils.Tests/Mocks/GQLModel.cs

@@ -2,73 +2,71 @@
 using Contentstack.Utils.Converters;
 using Contentstack.Utils.Interfaces;
 using Contentstack.Utils.Models;
-using Newtonsoft.Json;
+using System.Text.Json.Serialization;
 
 namespace Contentstack.Utils.Tests.Mocks
 {
-    public class GQLModel<T> where T: IEmbeddedObject
+    public class GQLModel<T> where T : IEmbeddedObject
     {
-        [Newtonsoft.Json.JsonConverter(typeof(RTEJsonConverter))]
         public JsonRTENodes<T> multiplerte { get; set; }
         public JsonRTENode<T> singlerte { get; set; }
     }
 
-    [Newtonsoft.Json.JsonConverter(typeof(RTEJsonConverter))]
+    [JsonConverter(typeof(PathMappedJsonConverter<EntryModel>))]
     public class EntryModel : IEmbeddedEntry
     {
-        [JsonProperty("system.uid")]
+        [JsonPropertyName("system.uid")]
         public string Uid
         {
             get;
             set;
         }
-        [JsonProperty("system.content_type_uid")]
+        [JsonPropertyName("system.content_type_uid")]
         public string ContentTypeUid
         {
             get;
             set;
         }
-        [JsonProperty("title")]
+        [JsonPropertyName("title")]
         public string Title
         {
             get;
             set;
         }
     }
 
-    [Newtonsoft.Json.JsonConverter(typeof(RTEJsonConverter))]
+    [JsonConverter(typeof(PathMappedJsonConverter<AssetModel>))]
     public class AssetModel : IEmbeddedAsset
     {
-        [JsonProperty("system.uid")]
+        [JsonPropertyName("system.uid")]
         public string Uid
         {
             get;
             set;
         }
-        [JsonProperty("system.content_type_uid")]
+        [JsonPropertyName("system.content_type_uid")]
         public string ContentTypeUid
         {
             get;
             set;
         }
-        [JsonProperty("title")]
+        [JsonPropertyName("title")]
         public string Title
         {
             get;
             set;
         }
-        [JsonProperty("filename")]
+        [JsonPropertyName("filename")]
         public string FileName
         {
             get;
             set;
         }
-        [JsonProperty("url")]
+        [JsonPropertyName("url")]
         public string Url
         {
             get;
             set;
         }
     }
 }
-