Skip to content

Commit 2f669b3

Browse files
januswjanusw
authored
Merge pull request #27 from mus65/updatedeps
Update dependencies and target frameworks and fix build warnings
2 parents 3503033 + 1da5537 commit 2f669b3

File tree

6 files changed

+31
-41
lines changed

6 files changed

+31
-41
lines changed

‎.github/workflows/ci-build.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,27 @@ jobs:
2525
VSTEST_CONNECTION_TIMEOUT: 900
2626

2727
steps:
28-
- uses: actions/checkout@v2
29-
- name: Setup .NET Core
30-
uses: actions/setup-dotnet@v1
28+
- uses: actions/checkout@v4
29+
- name: Setup .NET
30+
uses: actions/setup-dotnet@v4
3131
with:
3232
dotnet-version: |
33-
3.1.x
34-
5.0.x
3533
6.0.x
36-
7.0.x
34+
8.0.x
3735
- name: Install dependencies
3836
run: dotnet restore src/${{ env.PROJECT_NAME }}.sln
3937
- name: Build solution
4038
run: dotnet build src/${{ env.PROJECT_NAME }}.sln -c Release --no-restore
4139
- name: Test
4240
run: dotnet test src/${{ env.PROJECT_NAME }}.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=../coverage/
43-
- uses: codecov/codecov-action@v2
41+
- uses: codecov/codecov-action@v4
4442
if: github.ref == 'refs/heads/main'
4543
with:
4644
token: ${{ secrets.CODECOV_TOKEN }}
4745
directory: src/coverage
4846
flags: unittests
4947
- name: Upload Artifact
50-
uses: actions/upload-artifact@v2
48+
uses: actions/upload-artifact@v4
5149
with:
5250
name: nupkg
5351
path: src/${{ env.PROJECT_NAME }}/bin/Release/*.nupkg

‎.github/workflows/continous-benchmark.yml‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,18 @@ jobs:
1313
working-directory: ./src
1414

1515
steps:
16-
- uses: actions/checkout@v2
17-
- name: Setup .NET Core
18-
uses: actions/setup-dotnet@v1
16+
- uses: actions/checkout@v4
17+
- name: Setup .NET
18+
uses: actions/setup-dotnet@v4
1919
with:
2020
dotnet-version: |
21-
3.1.x
22-
5.0.x
23-
6.0.x
24-
7.0.x
21+
8.0.x
2522
# Run benchmark with `go test -bench` and stores the output to a file
2623
- name: Run benchmark
27-
run: dotnet run --project ./GeoJSON.Text.Test.Benchmark/GeoJSON.Text.Test.Benchmark.csproj --framework net6 --runtimes net60 -c Release -- --job medium -f *SerializeAndDeserialize*
24+
run: dotnet run --project ./GeoJSON.Text.Test.Benchmark/GeoJSON.Text.Test.Benchmark.csproj -c Release -- --job medium -f *SerializeAndDeserialize*
2825
# Download previous benchmark result from cache (if exists)
2926
- name: Download previous benchmark data
30-
uses: actions/cache@v1
27+
uses: actions/cache@v4
3128
with:
3229
path: ./cache
3330
key: ${{ runner.os }}-benchmark

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

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

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;netstandard2.0</TargetFrameworks>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<OutputType>Exe</OutputType>
56
<ImplicitUsings>disable</ImplicitUsings>
67
<Nullable>enable</Nullable>
78
<SignAssembly>False</SignAssembly>
8-
<LangVersion>10</LangVersion>
99
</PropertyGroup>
1010

1111
<ItemGroup>
@@ -27,9 +27,9 @@
2727
</ItemGroup>
2828

2929
<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" />
30+
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
31+
<PackageReference Include="GeoJSON.Net" Version="1.4.1" />
32+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
3333
</ItemGroup>
3434

3535
<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)