Skip to content

Update gRPC, Protobuf package versions #56909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 22, 2024
Merged

Update gRPC, Protobuf package versions #56909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6dd164b
Update gRPC, Protobuf and Protos package versions
JamesNK Jul 20, 2024
a6663d7
Undo
JamesNK Jul 20, 2024
07b38fc
Update
JamesNK Jul 20, 2024
21b2566
Update Swashbuckle
JamesNK Jul 20, 2024
81a1036
Fix test
JamesNK Jul 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,13 +299,13 @@
<CastleCoreVersion>4.2.1</CastleCoreVersion>
<CommandLineParserVersion>2.3.0</CommandLineParserVersion>
<FSharpCoreVersion>6.0.0</FSharpCoreVersion>
<GoogleApiCommonProtosVersion>2.5.0</GoogleApiCommonProtosVersion>
<GoogleProtobufVersion>3.23.1</GoogleProtobufVersion>
<GrpcAspNetCoreVersion>2.57.0</GrpcAspNetCoreVersion>
<GrpcAspNetCoreServerVersion>2.57.0</GrpcAspNetCoreServerVersion>
<GrpcAuthVersion>2.57.0</GrpcAuthVersion>
<GrpcNetClientVersion>2.57.0</GrpcNetClientVersion>
<GrpcToolsVersion>2.57.0</GrpcToolsVersion>
<GoogleApiCommonProtosVersion>2.15.0</GoogleApiCommonProtosVersion>
<GoogleProtobufVersion>3.27.0</GoogleProtobufVersion>
<GrpcAspNetCoreVersion>2.64.0</GrpcAspNetCoreVersion>
<GrpcAspNetCoreServerVersion>2.64.0</GrpcAspNetCoreServerVersion>
<GrpcAuthVersion>2.64.0</GrpcAuthVersion>
<GrpcNetClientVersion>2.64.0</GrpcNetClientVersion>
<GrpcToolsVersion>2.64.0</GrpcToolsVersion>
<MessagePackVersion>2.5.108</MessagePackVersion>
<MicrosoftIdentityWebVersion>3.0.0-preview3</MicrosoftIdentityWebVersion>
<MicrosoftIdentityWebGraphServiceClientVersion>3.0.0-preview3</MicrosoftIdentityWebGraphServiceClientVersion>
Expand All @@ -329,7 +329,7 @@
<SerilogSinksFileVersion>4.0.0</SerilogSinksFileVersion>
<StackExchangeRedisVersion>2.7.27</StackExchangeRedisVersion>
<SystemReactiveLinqVersion>5.0.0</SystemReactiveLinqVersion>
<SwashbuckleAspNetCoreVersion>6.4.0</SwashbuckleAspNetCoreVersion>
<SwashbuckleAspNetCoreVersion>6.6.2</SwashbuckleAspNetCoreVersion>
<VerifyXunitVersion>19.14.0</VerifyXunitVersion>
<XunitAbstractionsVersion>2.0.3</XunitAbstractionsVersion>
<XunitAnalyzersVersion>1.0.0</XunitAnalyzersVersion>
Expand Down
8 changes: 4 additions & 4 deletions ....AspNetCore.Grpc.JsonTranscoding/Internal/Binding/JsonTranscodingProviderServiceBinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ internal JsonTranscodingProviderServiceBinder(
_logger = loggerFactory.CreateLogger<JsonTranscodingProviderServiceBinder<TService>>();
}

public override void AddMethod<TRequest, TResponse>(Method<TRequest, TResponse> method, ClientStreamingServerMethod<TRequest, TResponse> handler)
public override void AddMethod<TRequest, TResponse>(Method<TRequest, TResponse> method, ClientStreamingServerMethod<TRequest, TResponse>? handler)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was the old version missing nullable annotations?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here, yes

{
if (TryGetMethodDescriptor(method.Name, out var methodDescriptor) &&
ServiceDescriptorHelpers.TryGetHttpRule(methodDescriptor, out _))
Expand All @@ -67,7 +67,7 @@ public override void AddMethod<TRequest, TResponse>(Method<TRequest, TResponse>
}
}

public override void AddMethod<TRequest, TResponse>(Method<TRequest, TResponse> method, DuplexStreamingServerMethod<TRequest, TResponse> handler)
public override void AddMethod<TRequest, TResponse>(Method<TRequest, TResponse> method, DuplexStreamingServerMethod<TRequest, TResponse>? handler)
{
if (TryGetMethodDescriptor(method.Name, out var methodDescriptor) &&
ServiceDescriptorHelpers.TryGetHttpRule(methodDescriptor, out _))
Expand All @@ -76,7 +76,7 @@ public override void AddMethod<TRequest, TResponse>(Method<TRequest, TResponse>
}
}

public override void AddMethod<TRequest, TResponse>(Method<TRequest, TResponse> method, ServerStreamingServerMethod<TRequest, TResponse> handler)
public override void AddMethod<TRequest, TResponse>(Method<TRequest, TResponse> method, ServerStreamingServerMethod<TRequest, TResponse>? handler)
{
if (TryGetMethodDescriptor(method.Name, out var methodDescriptor))
{
Expand All @@ -97,7 +97,7 @@ public override void AddMethod<TRequest, TResponse>(Method<TRequest, TResponse>
}
}

public override void AddMethod<TRequest, TResponse>(Method<TRequest, TResponse> method, UnaryServerMethod<TRequest, TResponse> handler)
public override void AddMethod<TRequest, TResponse>(Method<TRequest, TResponse> method, UnaryServerMethod<TRequest, TResponse>? handler)
{
if (TryGetMethodDescriptor(method.Name, out var methodDescriptor))
{
Expand Down
2 changes: 1 addition & 1 deletion ...scoding/test/Microsoft.AspNetCore.Grpc.Swagger.Tests/GrpcSwaggerServiceExtensionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void AddGrpcSwagger_GrpcServiceRegistered_ReturnSwaggerWithGrpcOperation(

var path = swagger.Paths["/v1/greeter/{name}"];
Assert.True(path.Operations.TryGetValue(OperationType.Get, out var operation));
Assert.Equal("Success", operation.Responses["200"].Description);
Assert.Equal("OK", operation.Responses["200"].Description);
Assert.Equal("Error", operation.Responses["default"].Description);
}

Expand Down
Loading