Skip to content

Commit ffa9a9b

Browse files
committed
Replace newtonsoft with system.text.json
1 parent 0a0830b commit ffa9a9b

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Config.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using System;
66
using System.IO;
7-
using Newtonsoft.Json;
7+
using System.Text.Json;
88

99
#nullable enable
1010

@@ -72,7 +72,7 @@ public static Config Load()
7272

7373
public static void UpdateConfig(Config updatedConfig, string configPath = @"config.jsonc")
7474
{
75-
string config = JsonConvert.SerializeObject(updatedConfig);
75+
string config = JsonSerializer.Serialize(updatedConfig);
7676
File.WriteAllText(configPath, config);
7777
}
7878

@@ -86,7 +86,7 @@ public static void UpdateConfig(Config updatedConfig, string configPath = @"conf
8686
try
8787
{
8888
using StreamReader sr = new StreamReader(configPath);
89-
return JsonConvert.DeserializeObject<Config>(sr.ReadToEnd()) ??
89+
return JsonSerializer.Deserialize<Config>(sr.ReadToEnd()) ??
9090
throw new InvalidOperationException($"Failed to deserialize config from '{configPath}'");
9191
}
9292
catch (FileNotFoundException)

src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@
22
<PropertyGroup>
33
<TargetFramework>netstandard2.0</TargetFramework>
44
</PropertyGroup>
5+
6+
<!-- Copy config file ================================================ -->
57
<Target Name="CopyConfig" BeforeTargets="Compile">
68
<Copy SourceFiles="config.default.jsonc" DestinationFiles="config.jsonc" Condition="!Exists('config.jsonc')" />
79
</Target>
810
<ItemGroup>
9-
<None Update="config.jsonc">
10-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
11-
</None>
12-
<PackageReference Include="Newtonsoft.Json" />
11+
<None Update="config.jsonc" CopyToOutputDirectory="PreserveNewest" />
12+
</ItemGroup>
13+
14+
<!-- References ====================================================== -->
15+
<ItemGroup>
16+
<PackageReference Include="System.Text.Json" />
1317
</ItemGroup>
1418
</Project>

0 commit comments

Comments
 (0)