Merge pull request #101 from aspnetboilerplate/System.Text.Json

Using `System.Text.Json` to replace `Newtonsoft`.
aspnetboilerplate · Jan 25, 2024 · 9d56a24 · 9d56a24
2 parents d34557a + e5f7f1e
commit 9d56a24
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 19 deletions.
diff --git a/NuGet.Config b/NuGet.Config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="ABP Nightly Source" value="https://www.myget.org/F/abp-nightly/api/v3/index.json" />
+  </packageSources>
+</configuration>
diff --git a/...bpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/...bpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
@@ -17,8 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.EntityFrameworkCore" Version="9.0.0" />
-    <PackageReference Include="Abp.AutoMapper" Version="9.0.0" />
+    <PackageReference Include="Abp.EntityFrameworkCore" Version="9.1.0-preview20240125" />
+    <PackageReference Include="Abp.AutoMapper" Version="9.1.0-preview20240125" />
   </ItemGroup>
 
 </Project>
diff --git a/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp" Version="9.0.0" />
+    <PackageReference Include="Abp" Version="9.1.0-preview20240125" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
   </ItemGroup>

diff --git a/...pProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj b/...pProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.EntityFrameworkCore" Version="9.0.0" />
+    <PackageReference Include="Abp.EntityFrameworkCore" Version="9.1.0-preview20240125" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Analyzers" Version="8.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>

diff --git a/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj b/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj
@@ -41,8 +41,8 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
     <PackageReference Include="Castle.Core" Version="5.1.1" />
-    <PackageReference Include="Abp.AspNetCore" Version="9.0.0" />
-    <PackageReference Include="Abp.Castle.Log4Net" Version="9.0.0" />
+    <PackageReference Include="Abp.AspNetCore" Version="9.1.0-preview20240125" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="9.1.0-preview20240125" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/AbpCompanyName.AbpProjectName.Web/Startup/Startup.cs b/src/AbpCompanyName.AbpProjectName.Web/Startup/Startup.cs
@@ -15,14 +15,14 @@ namespace AbpCompanyName.AbpProjectName.Web.Startup
 {
     public class Startup
     {
-    
+
         private readonly IWebHostEnvironment _hostingEnvironment;
 
         public Startup(IWebHostEnvironment env)
         {
             _hostingEnvironment = env;
         }
-        
+
         public IServiceProvider ConfigureServices(IServiceCollection services)
         {
             //Configure DbContext
@@ -34,7 +34,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
             services.AddControllersWithViews(options =>
             {
                 options.Filters.Add(new AutoValidateAntiforgeryTokenAttribute());
-            }).AddNewtonsoftJson();
+            });
 
             //Configure Abp and Dependency Injection
             return services.AddAbp<AbpProjectNameWebModule>(options =>

diff --git a/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj
@@ -29,7 +29,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Shouldly" Version="4.2.1" />
-    <PackageReference Include="Abp.TestBase" Version="9.0.0" />
+    <PackageReference Include="Abp.TestBase" Version="9.1.0-preview20240125" />
     <PackageReference Include="NSubstitute" Version="5.1.0" />
     <PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="4.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />

diff --git a/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj b/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj
@@ -31,7 +31,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
-    <PackageReference Include="Abp.AspNetCore.TestBase" Version="9.0.0" />
+    <PackageReference Include="Abp.AspNetCore.TestBase" Version="9.1.0-preview20240125" />
     <PackageReference Include="AngleSharp" Version="1.0.7" />
   </ItemGroup>
 

diff --git a/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpProjectNameWebTestBase.cs b/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpProjectNameWebTestBase.cs
@@ -1,19 +1,15 @@
 using System;
 using System.Net;
 using System.Net.Http;
-using System.Reflection;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Abp.AspNetCore.TestBase;
 using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
 using AbpCompanyName.AbpProjectName.Tests.TestDatas;
-using AbpCompanyName.AbpProjectName.Web.Controllers;
 using AbpCompanyName.AbpProjectName.Web.Startup;
-using AbpCompanyName.AbpProjectName.Web.Tests.Controllers;
 using AngleSharp.Html.Dom;
 using AngleSharp.Html.Parser;
 using Microsoft.AspNetCore.Hosting;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 using Shouldly;
 
 namespace AbpCompanyName.AbpProjectName.Web.Tests
@@ -46,9 +42,9 @@ protected async Task<T> GetResponseAsObjectAsync<T>(string url,
             HttpStatusCode expectedStatusCode = HttpStatusCode.OK)
         {
             var strResponse = await GetResponseAsStringAsync(url, expectedStatusCode);
-            return JsonConvert.DeserializeObject<T>(strResponse, new JsonSerializerSettings
+            return JsonSerializer.Deserialize<T>(strResponse, new JsonSerializerOptions()
             {
-                ContractResolver = new CamelCasePropertyNamesContractResolver()
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase
             });
         }
 
@@ -126,4 +122,4 @@ protected IHtmlDocument ParseHtml(string htmlString)
 
         #endregion
     }
-}
+}