Skip to content

Commit 296251d

Browse files
author
dima_z
committed
update to net6.0
1 parent 52029e5 commit 296251d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

server-dotnetcore/Controllers/CubeController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public async Task<IActionResult> PostFields([FromBody]FieldsRequest request)
8989
Response.StatusCode = 400;
9090
return new JsonResult("Incorrect request for this endpoint.");
9191
}
92-
return new JsonResult(response, new JsonSerializerOptions { IgnoreNullValues = true, PropertyNamingPolicy = JsonNamingPolicy.CamelCase, Converters = { new ColumnTypeJsonConverter() } });
92+
return new JsonResult(response, new JsonSerializerOptions { DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull, PropertyNamingPolicy = JsonNamingPolicy.CamelCase, Converters = { new ColumnTypeJsonConverter() } });
9393
}
9494

9595
/// <summary>
@@ -286,7 +286,7 @@ private async Task<string> SelectData(string index, Query query, int page)
286286
DataSlice data = new DataSlice(rawData);
287287
SelectResponse response = new SelectResponse();
288288
string[] responses = null;
289-
JsonSerializerOptions options = new JsonSerializerOptions { IgnoreNullValues = true, PropertyNamingPolicy = JsonNamingPolicy.CamelCase, Converters = { new SelectResponseJsonConverter() } };
289+
JsonSerializerOptions options = new JsonSerializerOptions { DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull, PropertyNamingPolicy = JsonNamingPolicy.CamelCase, Converters = { new SelectResponseJsonConverter() } };
290290
if (query.Filter != null)
291291
{
292292
data.FilterData(query.Filter);

server-dotnetcore/NetCoreServer.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<Authors>Flexmonster</Authors>
66
<Version>2.8.0</Version>
77
<Description>Sample server that implement Flexmonster custom data source API.</Description>

0 commit comments

Comments
 (0)