Skip to content

Commit 3a5d037

Browse files
hahn-kevhahn-kev
authored
setup central package management and update package versions (#20)
* setup central package management and update package versions * change ycs to use system.text.json instead of newtonsoft json
1 parent 481acfc commit 3a5d037

File tree

11 files changed

+67
-33
lines changed

11 files changed

+67
-33
lines changed

‎Directory.Packages.props‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.11" />
7+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.11" />
8+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.11" />
9+
<PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
10+
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
11+
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
12+
<PackageVersion Include="FluentAssertions" Version="6.12.2" />
13+
<PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1" />
14+
<PackageVersion Include="JetBrains.Profiler.SelfApi" Version="2.5.12" />
15+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
16+
<PackageVersion Include="System.Text.Json" Version="9.0.0" />
17+
<PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
18+
<PackageVersion Include="Verify.EntityFramework" Version="12.4.0" />
19+
<PackageVersion Include="Verify.Xunit" Version="28.2.1" />
20+
<PackageVersion Include="xunit" Version="2.9.2" />
21+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
22+
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
23+
<PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.19" />
24+
<PackageVersion Include="linq2db.AspNet" Version="5.4.1" />
25+
<PackageVersion Include="linq2db.EntityFrameworkCore" Version="8.1.0" />
26+
</ItemGroup>
27+
</Project>

‎src/Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
</PropertyGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.48" PrivateAssets="all"/>
21+
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="all"/>
2222
</ItemGroup>
2323
</Project>

‎src/SIL.Harmony.Core/SIL.Harmony.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.4" />
13-
<PackageReference Include="System.IO.Hashing" Version="8.0.0" />
14-
<PackageReference Include="System.Linq.Async" Version="6.0.1"/>
12+
<PackageReference Include="Microsoft.EntityFrameworkCore" />
13+
<PackageReference Include="System.IO.Hashing" />
14+
<PackageReference Include="System.Linq.Async" />
1515
</ItemGroup>
1616

1717
</Project>

‎src/SIL.Harmony.Linq2db/SIL.Harmony.Linq2db.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="linq2db.AspNet" Version="5.4.1" />
14-
<PackageReference Include="linq2db.EntityFrameworkCore" Version="8.1.0" />
13+
<PackageReference Include="linq2db.AspNet" />
14+
<PackageReference Include="linq2db.EntityFrameworkCore" />
1515
</ItemGroup>
1616

1717
</Project>

‎src/SIL.Harmony.Tests/DbContextTests.VerifyModel.verified.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,4 +151,4 @@
151151
Relational:ViewName:
152152
Relational:ViewSchema:
153153
Annotations:
154-
ProductVersion: 8.0.4
154+
ProductVersion: 8.0.11

‎src/SIL.Harmony.Tests/SIL.Harmony.Tests.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
11-
<PackageReference Include="FluentAssertions" Version="6.12.0" />
12-
<PackageReference Include="GitHubActionsTestLogger" Version="2.4.1">
10+
<PackageReference Include="BenchmarkDotNet" />
11+
<PackageReference Include="FluentAssertions" />
12+
<PackageReference Include="GitHubActionsTestLogger">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="JetBrains.Profiler.SelfApi" Version="2.5.10" />
17-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
18-
<PackageReference Include="Verify.DiffPlex" Version="2.3.0" />
19-
<PackageReference Include="Verify.EntityFramework" Version="12.1.0" />
20-
<PackageReference Include="Verify.Xunit" Version="23.2.0" />
21-
<PackageReference Include="xunit" Version="2.7.0" />
22-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
16+
<PackageReference Include="JetBrains.Profiler.SelfApi" />
17+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
18+
<PackageReference Include="Verify.DiffPlex" />
19+
<PackageReference Include="Verify.EntityFramework" />
20+
<PackageReference Include="Verify.Xunit" />
21+
<PackageReference Include="xunit" />
22+
<PackageReference Include="xunit.runner.visualstudio">
2323
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2424
<PrivateAssets>all</PrivateAssets>
2525
</PackageReference>
26-
<PackageReference Include="coverlet.collector" Version="6.0.0">
26+
<PackageReference Include="coverlet.collector">
2727
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2828
<PrivateAssets>all</PrivateAssets>
2929
</PackageReference>
30-
<PackageReference Include="System.Linq.Async" Version="6.0.1"/>
30+
<PackageReference Include="System.Linq.Async"/>
3131
</ItemGroup>
3232

3333
<ItemGroup>

‎src/SIL.Harmony/SIL.Harmony.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
17+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/Ycs/Structs/ContentJson.cs‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,26 @@
44
// </copyright>
55
// ------------------------------------------------------------------------------
66

7+
using System.Collections.ObjectModel;
78
using System.Diagnostics;
9+
using System.Text.Json;
10+
using System.Text.Json.Nodes;
11+
using System.Text.Json.Serialization;
812

913
namespace Ycs
1014
{
1115
public class ContentJson : IContentEx
1216
{
1317
internal const int _ref = 2;
1418

15-
private readonly List<object> _content;
19+
private readonly List<JsonNode> _content;
1620

17-
internal ContentJson(IEnumerable<object> data)
21+
internal ContentJson(IEnumerable<JsonNode> data)
1822
{
19-
_content = new List<object>(data);
23+
_content = new List<JsonNode>(data);
2024
}
2125

22-
private ContentJson(List<object> other)
26+
private ContentJson(List<JsonNode> other)
2327
{
2428
_content = other;
2529
}
@@ -29,7 +33,7 @@ private ContentJson(List<object> other)
2933
public bool Countable => true;
3034
public int Length => _content?.Count ?? 0;
3135

32-
public IReadOnlyList<object> GetContent() => _content.AsReadOnly();
36+
public IReadOnlyList<object> GetContent() => new ReadOnlyCollection<object>(_content.OfType<object>().ToList());
3337

3438
public IContent Copy() => new ContentJson(_content);
3539

@@ -68,22 +72,22 @@ void IContentEx.Write(IUpdateEncoder encoder, int offset)
6872
encoder.WriteLength(len);
6973
for (int i = offset; i < len; i++)
7074
{
71-
var jsonStr = Newtonsoft.Json.JsonConvert.SerializeObject(_content[i]);
75+
var jsonStr = JsonSerializer.Serialize(_content[i]);
7276
encoder.WriteString(jsonStr);
7377
}
7478
}
7579

7680
internal static ContentJson Read(IUpdateDecoder decoder)
7781
{
7882
var len = decoder.ReadLength();
79-
var content = new List<object>(len);
83+
var content = new List<JsonNode>(len);
8084

8185
for (int i = 0; i < len; i++)
8286
{
8387
var jsonStr = decoder.ReadString();
84-
object jsonObj = string.Equals(jsonStr, "undefined")
88+
JsonNode jsonObj = string.Equals(jsonStr, "undefined")
8589
? null
86-
: Newtonsoft.Json.JsonConvert.DeserializeObject(jsonStr);
90+
: JsonSerializer.Deserialize<JsonNode>(jsonStr);
8791
content.Add(jsonObj);
8892
}
8993

‎src/Ycs/Utils/UpdateDecoderV2.cs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
// ------------------------------------------------------------------------------
66

77
using System.Diagnostics;
8+
using System.Text.Json;
9+
using System.Text.Json.Nodes;
810

911
namespace Ycs
1012
{
@@ -197,7 +199,7 @@ public object ReadJson()
197199
CheckDisposed();
198200

199201
var jsonString = Reader.ReadVarString();
200-
var result = Newtonsoft.Json.JsonConvert.DeserializeObject(jsonString);
202+
var result = JsonSerializer.Deserialize<JsonNode>(jsonString);
201203
return result;
202204
}
203205

‎src/Ycs/Utils/UpdateEncoderV2.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// ------------------------------------------------------------------------------
66

77
using System.Diagnostics;
8+
using System.Text.Json;
89

910
namespace Ycs
1011
{
@@ -201,7 +202,7 @@ public void WriteKey(string key)
201202

202203
public void WriteJson<T>(T any)
203204
{
204-
var jsonString = Newtonsoft.Json.JsonConvert.SerializeObject(any, typeof(T), null);
205+
var jsonString = JsonSerializer.Serialize(any);
205206
RestWriter.WriteVarString(jsonString);
206207
}
207208

0 commit comments

Comments
 (0)