diff --git a/Directory.Build.props b/Directory.Build.props index bc09982f..2065f57e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -27,12 +27,12 @@ local 1.0.110 - 2.33.1 + 2.34.0 3.14.0 - 2.33.1 + 2.34.0 2.4.6 - 3.0.62 + 3.0.73 true diff --git a/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTicker.Shared/TraderSys.FullStockTicker.Shared.csproj b/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTicker.Shared/TraderSys.FullStockTicker.Shared.csproj index 3f2a9935..ac532aa4 100644 --- a/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTicker.Shared/TraderSys.FullStockTicker.Shared.csproj +++ b/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTicker.Shared/TraderSys.FullStockTicker.Shared.csproj @@ -8,7 +8,7 @@ - + diff --git a/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTickerClientApp/TraderSys.FullStockTickerClientApp.csproj b/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTickerClientApp/TraderSys.FullStockTickerClientApp.csproj index 1974d7b0..9e563800 100644 --- a/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTickerClientApp/TraderSys.FullStockTickerClientApp.csproj +++ b/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTickerClientApp/TraderSys.FullStockTickerClientApp.csproj @@ -12,7 +12,7 @@ - + diff --git a/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTickerServer/TraderSys.FullStockTickerServer.csproj b/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTickerServer/TraderSys.FullStockTickerServer.csproj index b2b33bc2..7aa0af3a 100644 --- a/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTickerServer/TraderSys.FullStockTickerServer.csproj +++ b/examples/wcf-port/FullStockTicker/src/TraderSys.FullStockTickerServer/TraderSys.FullStockTickerServer.csproj @@ -6,7 +6,7 @@ - + diff --git a/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer.ClientConsole/TraderSys.SimpleStockTickerServer.ClientConsole.csproj b/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer.ClientConsole/TraderSys.SimpleStockTickerServer.ClientConsole.csproj index d8111947..45a72692 100644 --- a/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer.ClientConsole/TraderSys.SimpleStockTickerServer.ClientConsole.csproj +++ b/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer.ClientConsole/TraderSys.SimpleStockTickerServer.ClientConsole.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer.Shared/TraderSys.SimpleStockTickerServer.Shared.csproj b/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer.Shared/TraderSys.SimpleStockTickerServer.Shared.csproj index 82306933..bcde8b12 100644 --- a/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer.Shared/TraderSys.SimpleStockTickerServer.Shared.csproj +++ b/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer.Shared/TraderSys.SimpleStockTickerServer.Shared.csproj @@ -9,7 +9,7 @@ - + diff --git a/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer/TraderSys.SimpleStockTickerServer.csproj b/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer/TraderSys.SimpleStockTickerServer.csproj index 0dec6a73..d9e866b8 100644 --- a/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer/TraderSys.SimpleStockTickerServer.csproj +++ b/examples/wcf-port/SimpleStockTicker/src/TraderSys.SimpleStockTickerServer/TraderSys.SimpleStockTickerServer.csproj @@ -6,7 +6,7 @@ - + diff --git a/examples/wcf-port/TraderSys/src/TraderSys.Portfolios.ClientConsole/TraderSys.Portfolios.ClientConsole.csproj b/examples/wcf-port/TraderSys/src/TraderSys.Portfolios.ClientConsole/TraderSys.Portfolios.ClientConsole.csproj index f1e019b1..464faba4 100644 --- a/examples/wcf-port/TraderSys/src/TraderSys.Portfolios.ClientConsole/TraderSys.Portfolios.ClientConsole.csproj +++ b/examples/wcf-port/TraderSys/src/TraderSys.Portfolios.ClientConsole/TraderSys.Portfolios.ClientConsole.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/wcf-port/TraderSys/src/TraderSys.Portfolios/TraderSys.Portfolios.csproj b/examples/wcf-port/TraderSys/src/TraderSys.Portfolios/TraderSys.Portfolios.csproj index 5e586b09..55d6a764 100644 --- a/examples/wcf-port/TraderSys/src/TraderSys.Portfolios/TraderSys.Portfolios.csproj +++ b/examples/wcf-port/TraderSys/src/TraderSys.Portfolios/TraderSys.Portfolios.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/protobuf-net.Grpc/ChannelAsyncEnumerableExtensions.cs b/src/protobuf-net.Grpc/ChannelAsyncEnumerableExtensions.cs index 6ada2407..027e08af 100644 --- a/src/protobuf-net.Grpc/ChannelAsyncEnumerableExtensions.cs +++ b/src/protobuf-net.Grpc/ChannelAsyncEnumerableExtensions.cs @@ -33,9 +33,9 @@ public static async IAsyncEnumerable AsAsyncEnumerable(this ChannelReader< { while (await reader.WaitToReadAsync(cancellationToken).ConfigureAwait(false)) { - while (reader.TryRead(out T item)) + while (reader.TryRead(out T? item)) { - yield return item; + yield return item!; } } } @@ -79,9 +79,9 @@ static void TryCompleteWriter(object? state) { while (await channel.Reader.WaitToReadAsync(cancellationToken).ConfigureAwait(false)) { - while (channel.Reader.TryRead(out T item)) + while (channel.Reader.TryRead(out T? item)) { - yield return item; + yield return item!; } } } diff --git a/src/protobuf-net.Grpc/Configuration/ServiceBinder.cs b/src/protobuf-net.Grpc/Configuration/ServiceBinder.cs index 6c2c5f5b..6b5fe5f1 100644 --- a/src/protobuf-net.Grpc/Configuration/ServiceBinder.cs +++ b/src/protobuf-net.Grpc/Configuration/ServiceBinder.cs @@ -19,7 +19,7 @@ public class ServiceBinder /// protected ServiceBinder() { } - private Dictionary _map = new Dictionary(); + private readonly Dictionary _map = new Dictionary(); private InterfaceMapping GetMap(Type contractType, Type serviceType) { if (!_map.TryGetValue(contractType, out var interfaceMapping)) diff --git a/tests/protobuf-net.Grpc.Reflection.Test/ReflectionServiceTests.cs b/tests/protobuf-net.Grpc.Reflection.Test/ReflectionServiceTests.cs index 6c8093fa..9ee08fb7 100644 --- a/tests/protobuf-net.Grpc.Reflection.Test/ReflectionServiceTests.cs +++ b/tests/protobuf-net.Grpc.Reflection.Test/ReflectionServiceTests.cs @@ -17,7 +17,7 @@ namespace protobuf_net.Grpc.Reflection.Test public class ReflectionServiceTests { - private static Lazy AddImportMethod = new Lazy(() => typeof(FileDescriptorProto).GetMethod("AddImport", BindingFlags.NonPublic | BindingFlags.Instance)); + private static readonly Lazy AddImportMethod = new Lazy(() => typeof(FileDescriptorProto).GetMethod("AddImport", BindingFlags.NonPublic | BindingFlags.Instance)!); [Theory] [MemberData(nameof(Dependencies))] @@ -42,7 +42,7 @@ public async Task ShouldIncludeDependenciesInCorrectOrder(Type service, string s { // Use reflection. var addImportMethod = AddImportMethod.Value; - addImportMethod.Invoke(fileDescriptor, new object[] {dependency, true, default}); + addImportMethod.Invoke(fileDescriptor, new object?[] {dependency, true, default}); } fileDescriptorSet.Files.Add(fileDescriptor);