Skip to content

Commit 8f18c5b

Browse files
neueccneuecc
committed
remove Utf8Json, use System.Text.Json
1 parent 55c982f commit 8f18c5b

File tree

3 files changed

+34
-36
lines changed

3 files changed

+34
-36
lines changed

‎src/MicroBatchFramework/BatchEngine.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
using System.Linq;
66
using System.Reflection;
77
using System.Text;
8+
using System.Text.Json;
89
using System.Threading;
910
using System.Threading.Tasks;
10-
using Utf8Json;
1111

1212
namespace MicroBatchFramework
1313
{
@@ -253,7 +253,7 @@ static bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, in
253253
}
254254
try
255255
{
256-
invokeArgs[i] = JsonSerializer.NonGeneric.Deserialize(parameters[i].ParameterType, v);
256+
invokeArgs[i] = JsonSerializer.Deserialize(v, parameters[i].ParameterType);
257257
continue;
258258
}
259259
catch
@@ -264,10 +264,9 @@ static bool TryGetInvokeArguments(ParameterInfo[] parameters, string?[] args, in
264264
}
265265
else
266266
{
267-
// decouple dependency?
268267
try
269268
{
270-
invokeArgs[i] = JsonSerializer.NonGeneric.Deserialize(parameters[i].ParameterType, value.Value);
269+
invokeArgs[i] = JsonSerializer.Deserialize(value.Value, parameters[i].ParameterType);
271270
continue;
272271
}
273272
catch

‎src/MicroBatchFramework/MicroBatchFramework.csproj‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,34 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>netstandard2.0</TargetFramework>
4+
<LangVersion>8.0</LangVersion>
5+
<Nullable>enable</Nullable>
6+
<SignAssembly>true</SignAssembly>
7+
<AssemblyOriginatorKeyFile>release.snk</AssemblyOriginatorKeyFile>
8+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9+
<Company>Cysharp</Company>
10+
<!-- Version is passed from CircleCI -->
11+
<!--<Version>1</Version>-->
212

3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<LangVersion>8.0</LangVersion>
6-
<Nullable>enable</Nullable>
7-
<SignAssembly>true</SignAssembly>
8-
<AssemblyOriginatorKeyFile>release.snk</AssemblyOriginatorKeyFile>
9-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10-
<Company>Cysharp</Company>
11-
<!-- Version is passed from CircleCI -->
12-
<!--<Version>1</Version>-->
13+
<!-- NuGet -->
14+
<PackageId>MicroBatchFramework</PackageId>
15+
<PackageVersion>$(Version)</PackageVersion>
16+
<Authors>Cysharp</Authors>
17+
<Copyright>Cysharp</Copyright>
18+
<Description>Cloud Native Batch Framework.</Description>
19+
<PackageProjectUrl>https://github.com/Cysharp/MicroBatchFramework</PackageProjectUrl>
20+
<RepositoryUrl>$(PackageProjectUrl)</RepositoryUrl>
21+
<RepositoryType>git</RepositoryType>
22+
<PackageTags>batch</PackageTags>
23+
</PropertyGroup>
1324

14-
<!-- NuGet -->
15-
<PackageId>MicroBatchFramework</PackageId>
16-
<PackageVersion>$(Version)</PackageVersion>
17-
<Authors>Cysharp</Authors>
18-
<Copyright>Cysharp</Copyright>
19-
<Description>Cloud Native Batch Framework.</Description>
20-
<PackageProjectUrl>https://github.com/Cysharp/MicroBatchFramework</PackageProjectUrl>
21-
<RepositoryUrl>$(PackageProjectUrl)</RepositoryUrl>
22-
<RepositoryType>git</RepositoryType>
23-
<PackageTags>batch</PackageTags>
24-
</PropertyGroup>
25+
<PropertyGroup>
26+
<NoWarn>1701;1702;1591</NoWarn>
27+
</PropertyGroup>
2528

26-
<PropertyGroup>
27-
<NoWarn>1701;1702;1591</NoWarn>
28-
</PropertyGroup>
29-
30-
<ItemGroup>
31-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" />
32-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
33-
<PackageReference Include="Utf8Json" Version="1.3.7" />
34-
</ItemGroup>
29+
<ItemGroup>
30+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.0" />
31+
<PackageReference Include="System.Text.Json" Version="4.7.0" />
32+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
33+
</ItemGroup>
3534
</Project>

‎tests/MicroBatchFramework.Tests/MicroBatchFramework.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
1212
<PackageReference Include="xunit" Version="2.4.1" />
1313
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
14-
<PackageReference Include="System.Threading.Tasks.Extensions" version="4.5.2" />
15-
<PackageReference Include="Utf8Json" version="1.3.7" />
14+
<PackageReference Include="System.Threading.Tasks.Extensions" version="4.5.3" />
15+
<PackageReference Include="System.Text.Json" Version="4.7.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

0 commit comments

Comments
 (0)