diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ce3fb7..a7d9843 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: "6.0.x" + dotnet-version: "8.0.x" - name: Build with dotnet run: dotnet build --configuration Release - name: Test with dotnet @@ -28,7 +28,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: "6.0.x" + dotnet-version: "8.0.x" - name: Build with dotnet run: dotnet build --configuration Release - name: Test with dotnet diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c806c4f..69a3d3b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: "6.0.x" + dotnet-version: "8.0.x" - name: Create NuGet Package 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 }}" - name: Archive NuGet Package diff --git a/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs.csproj b/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs.csproj index 6ee168a..a384f24 100644 --- a/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs.csproj +++ b/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs/Protobuf.System.Text.Json.Benchmark.MessageWithOneOfs.csproj @@ -2,17 +2,17 @@ Exe - net6.0 + net8.0 enable enable false - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields.csproj b/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields.csproj index f085f35..9d95110 100644 --- a/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields.csproj +++ b/benchmark/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields/Protobuf.System.Text.Json.Benchmark.MessageWithRepeatedFields.csproj @@ -2,17 +2,17 @@ Exe - net6.0 + net8.0 enable enable false - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/benchmark/Protobuf.System.Text.Json.Benchmark.Shared/Protobuf.System.Text.Json.Benchmark.Shared.csproj b/benchmark/Protobuf.System.Text.Json.Benchmark.Shared/Protobuf.System.Text.Json.Benchmark.Shared.csproj index 9b535c0..adcc478 100644 --- a/benchmark/Protobuf.System.Text.Json.Benchmark.Shared/Protobuf.System.Text.Json.Benchmark.Shared.csproj +++ b/benchmark/Protobuf.System.Text.Json.Benchmark.Shared/Protobuf.System.Text.Json.Benchmark.Shared.csproj @@ -1,15 +1,15 @@ - net6.0 + net8.0 enable enable false - - + + diff --git a/benchmark/Protobuf.System.Text.Json.Benchmark.SimpleMessage/Protobuf.System.Text.Json.Benchmark.SimpleMessage.csproj b/benchmark/Protobuf.System.Text.Json.Benchmark.SimpleMessage/Protobuf.System.Text.Json.Benchmark.SimpleMessage.csproj index 6ee168a..a384f24 100644 --- a/benchmark/Protobuf.System.Text.Json.Benchmark.SimpleMessage/Protobuf.System.Text.Json.Benchmark.SimpleMessage.csproj +++ b/benchmark/Protobuf.System.Text.Json.Benchmark.SimpleMessage/Protobuf.System.Text.Json.Benchmark.SimpleMessage.csproj @@ -2,17 +2,17 @@ Exe - net6.0 + net8.0 enable enable false - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Protobuf.System.Text.Json/JsonSerializerOptionsExtensions.cs b/src/Protobuf.System.Text.Json/JsonSerializerOptionsExtensions.cs index fec419c..9a38fd9 100644 --- a/src/Protobuf.System.Text.Json/JsonSerializerOptionsExtensions.cs +++ b/src/Protobuf.System.Text.Json/JsonSerializerOptionsExtensions.cs @@ -4,6 +4,9 @@ // ReSharper disable once CheckNamespace namespace System.Text.Json; +/// +/// Extension methods for . +/// public static class JsonSerializerOptionsExtensions { /// diff --git a/src/Protobuf.System.Text.Json/Protobuf.System.Text.Json.csproj b/src/Protobuf.System.Text.Json/Protobuf.System.Text.Json.csproj index bcab01d..7f6a68b 100644 --- a/src/Protobuf.System.Text.Json/Protobuf.System.Text.Json.csproj +++ b/src/Protobuf.System.Text.Json/Protobuf.System.Text.Json.csproj @@ -3,8 +3,8 @@ System.Text.Json extensions for Protobuf types. System.Text.Json extensions for Protobuf types. - net6.0;net5.0;netcoreapp3.1;netstandard2.0;netstandard2.1 - 10 + net8.0;net6.0;netstandard2.0;netstandard2.1 + 12 https://github.com/Havret/System.Text.Json.Protobuf Protobuf.System.Text.Json https://github.com/Havret/System.Text.Json.Protobuf/blob/main/LICENSE @@ -22,19 +22,8 @@ - - - - - - - - - - - - - + + diff --git a/src/Protobuf.System.Text.Json/ProtobufConverter.cs b/src/Protobuf.System.Text.Json/ProtobufConverter.cs index 15d9a9d..8e0986a 100644 --- a/src/Protobuf.System.Text.Json/ProtobufConverter.cs +++ b/src/Protobuf.System.Text.Json/ProtobufConverter.cs @@ -4,7 +4,6 @@ using Google.Protobuf; using Google.Protobuf.Reflection; using Protobuf.System.Text.Json.InternalConverters; -using Type = System.Type; namespace Protobuf.System.Text.Json; diff --git a/test/Protobuf.System.Text.Json.Tests/Protobuf.System.Text.Json.Tests.csproj b/test/Protobuf.System.Text.Json.Tests/Protobuf.System.Text.Json.Tests.csproj index e0a6341..72421da 100644 --- a/test/Protobuf.System.Text.Json.Tests/Protobuf.System.Text.Json.Tests.csproj +++ b/test/Protobuf.System.Text.Json.Tests/Protobuf.System.Text.Json.Tests.csproj @@ -1,27 +1,27 @@ - net6.0 + net8.0 enable false - + - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive