Moved newtonsoft json to system text json

.github/workflows/sca-scan.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Setup .NET Core @ Latest
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "7.0.x"
+          dotnet-version: "10.0.x"
 
       - name: Run Dotnet Restore
         run: dotnet restore

.github/workflows/unit-test.yml

@@ -9,10 +9,10 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4.2.2
-      - name: Setup .NET 7.0
+      - name: Setup .NET
         uses: actions/setup-dotnet@v4.3.0
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '10.0.x'
       - name: Restore dependencies
         run: dotnet restore Contentstack.Net.sln
       - name: Build solution

Contentstack.Core.Tests/Contentstack.Core.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
     <ReleaseVersion>$(Version)</ReleaseVersion>
@@ -27,17 +27,9 @@
     <DotNetCliToolReference Include="dotnet-reportgenerator-cli" Version="4.2.10" />
     <PackageReference Include="AutoFixture" Version="4.18.1" />
     <PackageReference Include="AutoFixture.AutoMoq" Version="4.18.1" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageReference Include="Moq" Version="4.20.72" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Contentstack.Core">
-      <HintPath>..\Contentstack.Core\bin\Debug\Contentstack.Core.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Remove="SingletoneTest.cs" />
     <Compile Remove="EmptyClass.cs" />

Contentstack.Core.Tests/Helpers/EntryFactory.cs

@@ -228,7 +228,7 @@ public async Task<ContentstackCollection<Entry>> FetchFirstEntryAsync(string con
         /// </summary>
         /// <param name="contentTypeUid">Content type UID</param>
         /// <returns>Count result</returns>
-        public async Task<Newtonsoft.Json.Linq.JObject> CountEntriesAsync(string contentTypeUid)
+        public async Task<System.Text.Json.Nodes.JsonObject> CountEntriesAsync(string contentTypeUid)
         {
             return await CreateQuery(contentTypeUid).Count();
         }

Contentstack.Core.Tests/Integration/AssetTests/AssetManagementComprehensiveTest.cs

@@ -560,7 +560,7 @@ public async Task Asset_Tags_Available()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/BranchTests/MetadataBranchComprehensiveTest.cs

@@ -382,7 +382,7 @@ public async Task Metadata_Performance_WithOwner()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/CachingTests/CachePersistenceTest.cs

@@ -439,7 +439,7 @@ public async Task Cache_DifferentProjections_IndependentCache()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/ClientTests/ContentstackClientTest.cs

@@ -17,7 +17,7 @@ public ContentstackClientTest(ITestOutputHelper output) : base(output)
         {
         }
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/ContentTypeTests/ContentTypeOperationsTest.cs

@@ -6,7 +6,7 @@
 using Contentstack.Core.Configuration;
 using Contentstack.Core.Models;
 using Contentstack.Core.Tests.Helpers;
-using Newtonsoft.Json.Linq;
+using System.Text.Json.Nodes;
 using System.Collections;
 using Xunit.Abstractions;
 
@@ -165,10 +165,10 @@ public async Task ContentType_FetchSingleContentType_ReturnsSchema()
             LogAssert("Verifying response");
 
             TestAssert.NotNull(schema);
-            TestAssert.IsType<JObject>(schema);
+            TestAssert.IsType<JsonObject>(schema);
             // Schema should contain uid
             TestAssert.True(schema.ContainsKey("uid"));
-            TestAssert.Equal(TestDataHelper.SimpleContentTypeUid, schema["uid"]?.ToString());
+            TestAssert.Equal(TestDataHelper.SimpleContentTypeUid, schema["uid"]?.GetValue<string>());
         }
 
         [Fact(DisplayName = "Content Type - Content Type Fetch With Global Fields Includes Global Field Schema")]
@@ -194,7 +194,7 @@ public async Task ContentType_FetchWithGlobalFields_IncludesGlobalFieldSchema()
             LogAssert("Verifying response");
 
             TestAssert.NotNull(schema);
-            TestAssert.IsType<JObject>(schema);
+            TestAssert.IsType<JsonObject>(schema);
         }
 
         [Fact(DisplayName = "Content Type - Content Type Fetch Complex Type Contains Expected Fields")]
@@ -216,7 +216,7 @@ public async Task ContentType_FetchComplexType_ContainsExpectedFields()
             LogAssert("Verifying response");
 
             TestAssert.NotNull(schema);
-            TestAssert.IsType<JObject>(schema);
+            TestAssert.IsType<JsonObject>(schema);
             // Should have schema field
             TestAssert.True(schema.ContainsKey("schema"));
         }
@@ -287,7 +287,7 @@ public async Task ContentType_Schema_ContainsUid()
 
             TestAssert.NotNull(schema);
             TestAssert.True(schema.ContainsKey("uid"));
-            TestAssert.Equal(TestDataHelper.MediumContentTypeUid, schema["uid"].ToString());
+            TestAssert.Equal(TestDataHelper.MediumContentTypeUid, schema["uid"]?.GetValue<string>());
         }
 
         [Fact(DisplayName = "Content Type - Content Type Schema Contains Schema Definition")]
@@ -310,7 +310,7 @@ public async Task ContentType_Schema_ContainsSchemaDefinition()
 
             TestAssert.NotNull(schema);
             TestAssert.True(schema.ContainsKey("schema"));
-            var schemaArray = schema["schema"] as JArray;
+            var schemaArray = schema["schema"] as JsonArray;
             TestAssert.NotNull(schemaArray);
             TestAssert.True(schemaArray.Count > 0, "Schema should contain field definitions");
         }
@@ -402,7 +402,7 @@ public async Task ContentType_MultipleContentTypes_AllFetchSuccessfully()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/ContentTypeTests/ContentTypeQueryTest.cs

@@ -6,7 +6,7 @@
 using Contentstack.Core.Configuration;
 using Contentstack.Core.Models;
 using Contentstack.Core.Tests.Helpers;
-using Newtonsoft.Json.Linq;
+using System.Text.Json.Nodes;
 using Xunit.Abstractions;
 
 namespace Contentstack.Core.Tests.Integration.ContentTypeTests
@@ -117,7 +117,7 @@ public async Task ContentTypeQuery_SchemaValidation_IsValidJObject()
             LogAssert("Verifying response");
 
             TestAssert.NotNull(schema);
-            TestAssert.IsType<JObject>(schema);
+            TestAssert.IsType<JsonObject>(schema);
         }
 
         #endregion
@@ -360,7 +360,7 @@ await TestAssert.ThrowsAnyAsync<Exception>(async () =>
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/EntryTests/EntryIncludeExtendedTest.cs

@@ -390,7 +390,7 @@ public async Task EntryInclude_Performance_MultipleIncludes()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/EntryTests/EntryOperationsComprehensiveTest.cs

@@ -734,7 +734,7 @@ public async Task Entry_AddParam_CustomParamIsApplied()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/EntryTests/FieldProjectionAndReferencesTest.cs

@@ -7,7 +7,6 @@
 using Contentstack.Core.Models;
 using Contentstack.Core.Tests.Helpers;
 using Contentstack.Core.Tests.Models;
-using Newtonsoft.Json.Linq;
 using Xunit.Abstractions;
 
 namespace Contentstack.Core.Tests.Integration.EntryTests
@@ -619,7 +618,7 @@ public async Task ReferenceQuery_WithOwner_IncludesOwnerInformation()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/GlobalFieldsTests/GlobalFieldsComprehensiveTest.cs

@@ -6,7 +6,7 @@
 using Contentstack.Core.Configuration;
 using Contentstack.Core.Models;
 using Contentstack.Core.Tests.Helpers;
-using Newtonsoft.Json.Linq;
+using System.Text.Json.Nodes;
 using Xunit.Abstractions;
 
 namespace Contentstack.Core.Tests.Integration.GlobalFieldsTests
@@ -412,7 +412,7 @@ public async Task GlobalFields_SchemaValidation_IsValidJObject()
             LogAssert("Verifying response");
 
             TestAssert.NotNull(schema);
-            TestAssert.IsType<JObject>(schema);
+            TestAssert.IsType<JsonObject>(schema);
         }
 
         #endregion
@@ -505,7 +505,7 @@ public async Task GlobalFields_EmptyGlobalField_ReturnsValidEntry()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/GlobalFieldsTests/NestedGlobalFieldsTest.cs

@@ -6,7 +6,7 @@
 using Contentstack.Core.Configuration;
 using Contentstack.Core.Models;
 using Contentstack.Core.Tests.Helpers;
-using Newtonsoft.Json.Linq;
+using System.Text.Json.Nodes;
 using Xunit.Abstractions;
 
 namespace Contentstack.Core.Tests.Integration.GlobalFieldsTests
@@ -386,7 +386,7 @@ public async Task NestedGlobal_SchemaValidation_IsValidJObject()
             LogAssert("Verifying response");
 
             TestAssert.NotNull(schema);
-            TestAssert.IsType<JObject>(schema);
+            TestAssert.IsType<JsonObject>(schema);
         }
 
         #endregion
@@ -425,7 +425,7 @@ public async Task NestedGlobal_Performance_DeepNesting()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/HeaderTests/HeaderManagementTest.cs

@@ -343,7 +343,7 @@ public async Task Header_RequestLevel_IndependentRequests()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/ImageDeliveryTests/ImageDeliveryComprehensiveTest.cs

@@ -311,7 +311,7 @@ public async Task ImageDelivery_Performance_MultipleAssets()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/JSONRTETests/JsonRteEmbeddedItemsTest.cs

@@ -52,7 +52,7 @@ public async Task JsonRte_BasicFetch_ReturnsEntry()
             var blocks = entry.Get("json_rte_field");
             if (blocks != null)
             {
-                var blocksArray = blocks as Newtonsoft.Json.Linq.JArray;
+                var blocksArray = blocks as System.Collections.IList;
                 if (blocksArray != null && blocksArray.Count > 0)
                 {
                     TestAssert.True(blocksArray.Count > 0, "Modular blocks should have content");
@@ -90,7 +90,7 @@ public async Task JsonRte_WithEmbeddedItems_IncludesEmbedded()
             var blocks = entry.Get("json_rte_field");
             if (blocks != null)
             {
-                var blocksArray = blocks as Newtonsoft.Json.Linq.JArray;
+                var blocksArray = blocks as System.Collections.IList;
                 if (blocksArray != null && blocksArray.Count > 0)
                 {
                     TestAssert.True(blocksArray.Count > 0, "Modular blocks should have content");
@@ -132,7 +132,7 @@ public async Task JsonRte_EmbeddedEntry_SingleLevel()
             var blocks = entry.Get("json_rte_field");
             if (blocks != null)
             {
-                var blocksArray = blocks as Newtonsoft.Json.Linq.JArray;
+                var blocksArray = blocks as System.Collections.IList;
                 if (blocksArray != null && blocksArray.Count > 0)
                 {
                     TestAssert.True(blocksArray.Count > 0, "Modular blocks should have content");
@@ -426,7 +426,7 @@ public async Task JsonRte_EmptyRte_HandlesGracefully()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/LocalizationTests/LocaleFallbackChainTest.cs

@@ -399,7 +399,7 @@ public async Task Fallback_NoTranslation_FallsBackCompletely()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/LocalizationTests/LocalizationExtendedTest.cs

@@ -257,7 +257,7 @@ public async Task LocaleExtended_MultipleLocaleRequests_Independent()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/ModularBlocksTests/ModularBlocksComprehensiveTest.cs

@@ -52,7 +52,7 @@ public async Task ModularBlocks_BasicFetch_ReturnsEntry()
             var blocks = entry.Get("modular_blocks");
             if (blocks != null)
             {
-                var blocksArray = blocks as Newtonsoft.Json.Linq.JArray;
+                var blocksArray = blocks as System.Collections.IList;
                 if (blocksArray != null && blocksArray.Count > 0)
                 {
                     TestAssert.True(blocksArray.Count > 0, "Modular blocks should have content");
@@ -418,7 +418,7 @@ public async Task ModularBlocks_EmptyBlocks_HandlesGracefully()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/PaginationTests/PaginationComprehensiveTest.cs

@@ -282,7 +282,7 @@ public async Task Pagination_LargeSkip_HandlesGracefully()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/PerformanceTests/PerformanceLargeDatasetsTest.cs

@@ -440,7 +440,7 @@ public async Task Performance_CachedVsUncached_Consistency()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {

Contentstack.Core.Tests/Integration/QueryEncodingTests/QueryEncodingComprehensiveTest.cs

@@ -732,7 +732,7 @@ public async Task Encoding_MixedCharacterSet_AllTypesEncoded()
 
         #region Helper Methods
 
-        private ContentstackClient CreateClient()
+        private new ContentstackClient CreateClient()
         {
             var options = new ContentstackOptions()
             {