Merge pull request #169 from contentstack/feat/dx-4964

Moved newtonsoft json to system text json

Author: sunil-lakshman

.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()
             {