Skip to content

Commit af9ab31

Browse files
committed
Update dependencies and target frameworks and fix build warnings
1 parent 3503033 commit af9ab31

File tree

4 files changed

+18
-24
lines changed

4 files changed

+18
-24
lines changed

src/GeoJSON.Text.Test.Benchmark/GeoJSON.Text.Test.Benchmark.csproj

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
55
<ImplicitUsings>disable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<SignAssembly>False</SignAssembly>
8-
<LangVersion>10</LangVersion>
98
</PropertyGroup>
109

1110
<ItemGroup>
@@ -27,9 +26,9 @@
2726
</ItemGroup>
2827

2928
<ItemGroup>
30-
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
31-
<PackageReference Include="GeoJSON.Net" Version="1.2.19" />
32-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
29+
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
30+
<PackageReference Include="GeoJSON.Net" Version="1.4.1" />
31+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3332
</ItemGroup>
3433

3534
<ItemGroup>

src/GeoJSON.Text.Test.Benchmark/TestConfig.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public TestConfig()
3333

3434
private class FastestToSlowestOrderer : IOrderer
3535
{
36-
public IEnumerable<BenchmarkCase> GetExecutionOrder(ImmutableArray<BenchmarkCase> benchmarksCase) =>
36+
public IEnumerable<BenchmarkCase> GetExecutionOrder(ImmutableArray<BenchmarkCase> benchmarksCase, IEnumerable<BenchmarkLogicalGroupRule>? order = null) =>
3737
from benchmark in benchmarksCase
3838
orderby benchmark.Parameters["X"] descending,
3939
benchmark.Descriptor.WorkloadMethodDisplayInfo
@@ -44,13 +44,13 @@ from benchmark in benchmarksCase
4444
public string GetLogicalGroupKey(ImmutableArray<BenchmarkCase> allBenchmarksCases, BenchmarkCase benchmarkCase) =>
4545
benchmarkCase.Job.DisplayInfo + "_" + benchmarkCase.Parameters.DisplayInfo;
4646

47-
public IEnumerable<IGrouping<string, BenchmarkCase>> GetLogicalGroupOrder(IEnumerable<IGrouping<string, BenchmarkCase>> logicalGroups) =>
47+
public IEnumerable<IGrouping<string, BenchmarkCase>> GetLogicalGroupOrder(IEnumerable<IGrouping<string, BenchmarkCase>> logicalGroups, IEnumerable<BenchmarkLogicalGroupRule>? order = null) =>
4848
logicalGroups.OrderBy(it => it.Key);
4949

5050
public IEnumerable<BenchmarkCase> GetSummaryOrder(ImmutableArray<BenchmarkCase> benchmarksCases, Summary summary)
5151
{
5252
var benchmarkResult = from benchmark in benchmarksCases
53-
orderby summary[benchmark].ResultStatistics.Mean
53+
orderby summary[benchmark]?.ResultStatistics?.Mean ?? 0
5454
select benchmark;
5555

5656
return benchmarkResult;

src/GeoJSON.Text.Test.Unit/GeoJSON.Text.Test.Unit.csproj

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
<ProjectGuid>{6C93B314-9208-4684-B873-172F7EC81689}</ProjectGuid>
55
<RootNamespace>GeoJSON.Text.Tests</RootNamespace>
66
<AssemblyName>GeoJSON.Text.Tests</AssemblyName>
7-
<TargetFrameworks>net6.0;net7.0;netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
88
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
9-
<LangVersion>10</LangVersion>
109
</PropertyGroup>
1110
<ItemGroup>
1211
<None Remove="Feature\FeatureCollectionTests_Can_Deserialize.json" />
@@ -61,18 +60,18 @@
6160
<EmbeddedResource Include="Geometry\PolygonTests_Can_Serialize.json" />
6261
</ItemGroup>
6362
<ItemGroup>
64-
<PackageReference Include="coverlet.collector" Version="3.1.0">
63+
<PackageReference Include="coverlet.collector" Version="6.0.2">
6564
<PrivateAssets>all</PrivateAssets>
6665
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6766
</PackageReference>
68-
<PackageReference Include="coverlet.msbuild" Version="3.1.0">
67+
<PackageReference Include="coverlet.msbuild" Version="6.0.2">
6968
<PrivateAssets>all</PrivateAssets>
7069
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7170
</PackageReference>
72-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
73-
<PackageReference Include="NUnit" Version="3.13.2" />
74-
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
75-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
71+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
72+
<PackageReference Include="NUnit" Version="3.14.0" />
73+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
74+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
7675
</ItemGroup>
7776
<ItemGroup>
7877
<ProjectReference Include="..\GeoJSON.Text\GeoJSON.Text.csproj" />

src/GeoJSON.Text/GeoJSON.Text.csproj

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>net6.0;net8.0;netstandard2.0</TargetFrameworks>
55
<LangVersion>10</LangVersion>
66
<Description>.Net types for the GeoJSON RFC to be used with System.Text.Json</Description>
77
<Authors>Matt Hunt</Authors>
@@ -29,15 +29,11 @@
2929
</PropertyGroup>
3030

3131
<ItemGroup>
32-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
33-
<PrivateAssets>all</PrivateAssets>
34-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
35-
</PackageReference>
36-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
32+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3733
</ItemGroup>
3834

39-
<ItemGroup Condition="'$(TargetFramework)'== 'netStandard2.0'">
40-
<PackageReference Include="System.Text.Json" Version="6.0.1" />
35+
<ItemGroup Condition="'$(TargetFramework)'== 'netstandard2.0'">
36+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
4137
</ItemGroup>
4238

4339
</Project>

0 commit comments

Comments
 (0)