Skip to content

Commit 5dcd6da

Browse files
committed
Using System.Text.Json to replace Newtonsoft.
1 parent dc554bb commit 5dcd6da

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

src/AbpCompanyName.AbpProjectName.Web/Startup/Startup.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ namespace AbpCompanyName.AbpProjectName.Web.Startup
1515
{
1616
public class Startup
1717
{
18-
18+
1919
private readonly IWebHostEnvironment _hostingEnvironment;
2020

2121
public Startup(IWebHostEnvironment env)
2222
{
2323
_hostingEnvironment = env;
2424
}
25-
25+
2626
public IServiceProvider ConfigureServices(IServiceCollection services)
2727
{
2828
//Configure DbContext
@@ -34,7 +34,7 @@ public IServiceProvider ConfigureServices(IServiceCollection services)
3434
services.AddControllersWithViews(options =>
3535
{
3636
options.Filters.Add(new AutoValidateAntiforgeryTokenAttribute());
37-
}).AddNewtonsoftJson();
37+
});
3838

3939
//Configure Abp and Dependency Injection
4040
return services.AddAbp<AbpProjectNameWebModule>(options =>

test/AbpCompanyName.AbpProjectName.Web.Tests/AbpProjectNameWebTestBase.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
using System;
22
using System.Net;
33
using System.Net.Http;
4-
using System.Reflection;
4+
using System.Text.Json;
55
using System.Threading.Tasks;
66
using Abp.AspNetCore.TestBase;
77
using AbpCompanyName.AbpProjectName.EntityFrameworkCore;
88
using AbpCompanyName.AbpProjectName.Tests.TestDatas;
9-
using AbpCompanyName.AbpProjectName.Web.Controllers;
109
using AbpCompanyName.AbpProjectName.Web.Startup;
11-
using AbpCompanyName.AbpProjectName.Web.Tests.Controllers;
1210
using AngleSharp.Html.Dom;
1311
using AngleSharp.Html.Parser;
1412
using Microsoft.AspNetCore.Hosting;
15-
using Newtonsoft.Json;
16-
using Newtonsoft.Json.Serialization;
1713
using Shouldly;
1814

1915
namespace AbpCompanyName.AbpProjectName.Web.Tests
@@ -46,9 +42,9 @@ protected async Task<T> GetResponseAsObjectAsync<T>(string url,
4642
HttpStatusCode expectedStatusCode = HttpStatusCode.OK)
4743
{
4844
var strResponse = await GetResponseAsStringAsync(url, expectedStatusCode);
49-
return JsonConvert.DeserializeObject<T>(strResponse, new JsonSerializerSettings
45+
return JsonSerializer.Deserialize<T>(strResponse, new JsonSerializerOptions()
5046
{
51-
ContractResolver = new CamelCasePropertyNamesContractResolver()
47+
PropertyNamingPolicy = JsonNamingPolicy.CamelCase
5248
});
5349
}
5450

@@ -126,4 +122,4 @@ protected IHtmlDocument ParseHtml(string htmlString)
126122

127123
#endregion
128124
}
129-
}
125+
}

0 commit comments

Comments
 (0)