Skip to content

Commit 956a498

Browse files
HavretHavret
authored
Bump dependencies (#63)
1 parent c72dd78 commit 956a498

10 files changed

Lines changed: 37 additions & 46 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup .NET Core
1717
uses: actions/setup-dotnet@v1
1818
with:
19-
dotnet-version: "6.0.x"
19+
dotnet-version: "8.0.x"
2020
- name: Build with dotnet
2121
run: dotnet build --configuration Release
2222
- name: Test with dotnet
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup .NET Core
2929
uses: actions/setup-dotnet@v1
3030
with:
31-
dotnet-version: "6.0.x"
31+
dotnet-version: "8.0.x"
3232
- name: Build with dotnet
3333
run: dotnet build --configuration Release
3434
- name: Test with dotnet

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup .NET Core
1919
uses: actions/setup-dotnet@v1
2020
with:
21-
dotnet-version: "6.0.x"
21+
dotnet-version: "8.0.x"
2222
- name: Create NuGet Package
2323
run: dotnet pack -c Release /p:Version=${{ github.event.release.name }} /p:PackageReleaseNotes="See https://github.com/Havret/Protobuf.System.Text.Json/releases/tag/${{ github.event.release.tag_name }}"
2424
- name: Archive NuGet Package

‎benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
13-
<PackageReference Include="Google.Protobuf" Version="3.19.4" />
14-
<PackageReference Include="Google.Protobuf.Tools" Version="3.19.4" />
15-
<PackageReference Include="Grpc.Tools" Version="2.44.0">
12+
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
13+
<PackageReference Include="Google.Protobuf" Version="3.27.1" />
14+
<PackageReference Include="Google.Protobuf.Tools" Version="3.27.1" />
15+
<PackageReference Include="Grpc.Tools" Version="2.64.0">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>

‎benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
13-
<PackageReference Include="Google.Protobuf" Version="3.19.4" />
14-
<PackageReference Include="Google.Protobuf.Tools" Version="3.19.4" />
15-
<PackageReference Include="Grpc.Tools" Version="2.44.0">
12+
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
13+
<PackageReference Include="Google.Protobuf" Version="3.27.1" />
14+
<PackageReference Include="Google.Protobuf.Tools" Version="3.27.1" />
15+
<PackageReference Include="Grpc.Tools" Version="2.64.0">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>

‎benchmark/Protobuf.System.Text.Json.Benchmark.Shared/Protobuf.System.Text.Json.Benchmark.Shared.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Google.Protobuf" Version="3.19.4" />
12-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
11+
<PackageReference Include="Google.Protobuf" Version="3.27.1" />
12+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎benchmark/Protobuf.System.Text.Json.Benchmark.SimpleMessage/Protobuf.System.Text.Json.Benchmark.SimpleMessage.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<IsPackable>false</IsPackable>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
13-
<PackageReference Include="Google.Protobuf" Version="3.19.4" />
14-
<PackageReference Include="Google.Protobuf.Tools" Version="3.19.4" />
15-
<PackageReference Include="Grpc.Tools" Version="2.44.0">
12+
<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
13+
<PackageReference Include="Google.Protobuf" Version="3.27.1" />
14+
<PackageReference Include="Google.Protobuf.Tools" Version="3.27.1" />
15+
<PackageReference Include="Grpc.Tools" Version="2.64.0">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>

‎src/Protobuf.System.Text.Json/JsonSerializerOptionsExtensions.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
// ReSharper disable once CheckNamespace
55
namespace System.Text.Json;
66

7+
/// <summary>
8+
/// Extension methods for <see cref="JsonSerializerOptions"/>.
9+
/// </summary>
710
public static class JsonSerializerOptionsExtensions
811
{
912
/// <summary>

‎src/Protobuf.System.Text.Json/Protobuf.System.Text.Json.csproj‎

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<PropertyGroup>
44
<Summary>System.Text.Json extensions for Protobuf types.</Summary>
55
<Description>System.Text.Json extensions for Protobuf types.</Description>
6-
<TargetFrameworks>net6.0;net5.0;netcoreapp3.1;netstandard2.0;netstandard2.1</TargetFrameworks>
7-
<LangVersion>10</LangVersion>
6+
<TargetFrameworks>net8.0;net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
7+
<LangVersion>12</LangVersion>
88
<PackageProjectUrl>https://github.com/Havret/System.Text.Json.Protobuf</PackageProjectUrl>
99
<PackageId>Protobuf.System.Text.Json</PackageId>
1010
<PackageLicenseUrl>https://github.com/Havret/System.Text.Json.Protobuf/blob/main/LICENSE</PackageLicenseUrl>
@@ -22,19 +22,8 @@
2222
</PropertyGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Google.Protobuf" Version="3.19.0" />
26-
</ItemGroup>
27-
28-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
29-
<PackageReference Include="System.Text.Json" Version="5.0.0" />
30-
</ItemGroup>
31-
32-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
33-
<PackageReference Include="System.Text.Json" Version="5.0.0" />
34-
</ItemGroup>
35-
36-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
37-
<PackageReference Include="System.Text.Json" Version="5.0.0" />
25+
<PackageReference Include="Google.Protobuf" Version="3.27.1" />
26+
<PackageReference Include="System.Text.Json" Version="8.0.3" />
3827
</ItemGroup>
3928

4029
</Project>

‎src/Protobuf.System.Text.Json/ProtobufConverter.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using Google.Protobuf;
55
using Google.Protobuf.Reflection;
66
using Protobuf.System.Text.Json.InternalConverters;
7-
using Type = System.Type;
87

98
namespace Protobuf.System.Text.Json;
109

‎test/Protobuf.System.Text.Json.Tests/Protobuf.System.Text.Json.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
1111
<PackageReference Include="Shouldly" Version="4.0.3" />
12-
<PackageReference Include="SmartAnalyzers.ApprovalTestsExtensions" Version="2.3.2" />
13-
<PackageReference Include="xunit" Version="2.4.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
12+
<PackageReference Include="SmartAnalyzers.ApprovalTestsExtensions" Version="2.8.0" />
13+
<PackageReference Include="xunit" Version="2.8.1" />
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
<PrivateAssets>all</PrivateAssets>
1717
</PackageReference>
18-
<PackageReference Include="coverlet.collector" Version="3.1.0">
18+
<PackageReference Include="coverlet.collector" Version="6.0.2">
1919
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2020
<PrivateAssets>all</PrivateAssets>
2121
</PackageReference>
22-
<PackageReference Include="Google.Protobuf" Version="3.19.4" />
23-
<PackageReference Include="Google.Protobuf.Tools" Version="3.19.4" />
24-
<PackageReference Include="Grpc.Tools" Version="2.44.0">
22+
<PackageReference Include="Google.Protobuf" Version="3.27.1" />
23+
<PackageReference Include="Google.Protobuf.Tools" Version="3.27.1" />
24+
<PackageReference Include="Grpc.Tools" Version="2.64.0">
2525
<PrivateAssets>all</PrivateAssets>
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>

0 commit comments

Comments
 (0)