Using System.Text.Json to replace Newtonsoft.

Author: maliming

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/Startup/Startup.cs

@@ -14,11 +14,8 @@
 using AbpCompanyName.AbpProjectName.Configuration;
 using AbpCompanyName.AbpProjectName.Identity;
 using Abp.AspNetCore.SignalR.Hubs;
-using Abp.Dependency;
-using Abp.Json;
 using Microsoft.Extensions.Hosting;
 using Microsoft.OpenApi.Models;
-using Newtonsoft.Json.Serialization;
 using System.IO;
 
 namespace AbpCompanyName.AbpProjectName.Web.Host.Startup
@@ -41,14 +38,9 @@ public Startup(IWebHostEnvironment env)
         public void ConfigureServices(IServiceCollection services)
         {
             //MVC
-            services.AddControllersWithViews(
-                options => { options.Filters.Add(new AbpAutoValidateAntiforgeryTokenAttribute()); }
-            ).AddNewtonsoftJson(options =>
+            services.AddControllersWithViews(options =>
             {
-                options.SerializerSettings.ContractResolver = new AbpMvcContractResolver(IocManager.Instance)
-                {
-                    NamingStrategy = new CamelCaseNamingStrategy()
-                };
+                options.Filters.Add(new AbpAutoValidateAntiforgeryTokenAttribute());
             });
 
             IdentityRegistrar.Register(services);
@@ -103,7 +95,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
             app.UseAuthorization();
 
             app.UseAbpRequestLocalization();
-            
+
             app.UseEndpoints(endpoints =>
             {
                 endpoints.MapHub<AbpCommonHub>("/signalr");
@@ -121,10 +113,10 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, ILoggerF
                 options.SwaggerEndpoint($"/swagger/{_apiVersion}/swagger.json", $"AbpProjectName API {_apiVersion}");
                 options.IndexStream = () => Assembly.GetExecutingAssembly()
                     .GetManifestResourceStream("AbpCompanyName.AbpProjectName.Web.Host.wwwroot.swagger.ui.index.html");
-                options.DisplayRequestDuration(); // Controls the display of the request duration (in milliseconds) for "Try it out" requests.  
+                options.DisplayRequestDuration(); // Controls the display of the request duration (in milliseconds) for "Try it out" requests.
             }); // URL: /swagger
         }
-        
+
         private void ConfigureSwagger(IServiceCollection services)
         {
             services.AddSwaggerGen(options =>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Startup/Startup.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Text.Encodings.Web;
+using System.Text.Encodings.Web;
 using System.Text.Unicode;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -16,12 +15,8 @@
 using AbpCompanyName.AbpProjectName.Identity;
 using AbpCompanyName.AbpProjectName.Web.Resources;
 using Abp.AspNetCore.SignalR.Hubs;
-using Abp.Dependency;
-using Abp.Json;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.WebEncoders;
-using Newtonsoft.Json.Serialization;
-
 
 namespace AbpCompanyName.AbpProjectName.Web.Startup
 {
@@ -46,14 +41,7 @@ public void ConfigureServices(IServiceCollection services)
                         options.Filters.Add(new AbpAutoValidateAntiforgeryTokenAttribute());
                     }
                 )
-                .AddRazorRuntimeCompilation()
-                .AddNewtonsoftJson(options =>
-                {
-                    options.SerializerSettings.ContractResolver = new AbpMvcContractResolver(IocManager.Instance)
-                    {
-                        NamingStrategy = new CamelCaseNamingStrategy()
-                    };
-                });
+                .AddRazorRuntimeCompilation();
 
             IdentityRegistrar.Register(services);
             AuthConfigurer.Configure(services, _appConfiguration);
@@ -62,7 +50,7 @@ public void ConfigureServices(IServiceCollection services)
             {
                 options.TextEncoderSettings = new TextEncoderSettings(UnicodeRanges.All);
             });
-            
+
             services.AddScoped<IWebResourceManager, WebResourceManager>();
 
             services.AddSignalR();

aspnet-core/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpProjectNameWebTestBase.cs

@@ -4,6 +4,7 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Abp.AspNetCore.TestBase;
 using Abp.Authorization.Users;
@@ -17,8 +18,6 @@
 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
@@ -31,7 +30,7 @@ static AbpProjectNameWebTestBase()
         {
             ContentRootFolder = new Lazy<string>(WebContentDirectoryFinder.CalculateContentRootFolder, true);
         }
-        
+
         protected override IWebHostBuilder CreateWebHostBuilder()
         {
             return base
@@ -46,9 +45,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
             });
         }
 
@@ -68,9 +67,9 @@ protected async Task<HttpResponseMessage> GetResponseAsync(string url,
         }
 
         #endregion
-        
+
         #region Authenticate
-        
+
         /// <summary>
         /// /api/TokenAuth/Authenticate
         /// TokenAuthController
@@ -81,7 +80,7 @@ protected async Task<HttpResponseMessage> GetResponseAsync(string url,
         protected async Task AuthenticateAsync(string tenancyName, AuthenticateModel input)
         {
             if (tenancyName.IsNullOrWhiteSpace())
-            { 
+            {
                 var tenant = UsingDbContext(context => context.Tenants.FirstOrDefault(t => t.TenancyName == tenancyName));
                 if (tenant != null)
                 {
@@ -93,16 +92,17 @@ protected async Task AuthenticateAsync(string tenancyName, AuthenticateModel inp
             var response = await Client.PostAsync("/api/TokenAuth/Authenticate",
                 new StringContent(input.ToJsonString(), Encoding.UTF8, "application/json"));
             response.StatusCode.ShouldBe(HttpStatusCode.OK);
-            var result =
-                JsonConvert.DeserializeObject<AjaxResponse<AuthenticateResultModel>>(
-                    await response.Content.ReadAsStringAsync());
+            var result = JsonSerializer.Deserialize<AjaxResponse<AuthenticateResultModel>>(await response.Content.ReadAsStringAsync(), new JsonSerializerOptions()
+            {
+                PropertyNamingPolicy = JsonNamingPolicy.CamelCase
+            });
             Client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", result.Result.AccessToken);
-            
+
             AbpSession.UserId = result.Result.UserId;
         }
-        
+
         #endregion
-        
+
         #region Login
 
         protected void LoginAsHostAdmin()
@@ -155,7 +155,6 @@ protected void LoginAsTenant(string tenancyName, string userName)
 
         #endregion
 
-
         #region UsingDbContext
 
         protected void UsingDbContext(Action<AbpProjectNameDbContext> action)
@@ -213,4 +212,4 @@ protected IHtmlDocument ParseHtml(string htmlString)
 
         #endregion
     }
-}
+}