Skip to content

Commit

Permalink
Bump Grpc.Core dependency to 2.31.0-pre2 (#1001)
Browse files Browse the repository at this point in the history
* Bump Grpc.Core dependency to 2.31.0-pre2

* Update dependencies.props

* Fix nullable warnings

* Fix package version

Co-authored-by: John Luo <[email protected]>
Co-authored-by: James Newton-King <[email protected]>
  • Loading branch information
3 people authored Aug 3, 2020
1 parent 49fc4f1 commit 1b44bef
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build/dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<BenchmarkDotNetPackageVersion>0.12.1</BenchmarkDotNetPackageVersion>
<GoogleProtobufPackageVersion>3.12.2</GoogleProtobufPackageVersion>
<GrpcDotNetPackageVersion>2.30.0</GrpcDotNetPackageVersion> <!-- Used by example projects -->
<GrpcPackageVersion>2.30.0</GrpcPackageVersion>
<GrpcPackageVersion>2.31.0-pre2</GrpcPackageVersion>
<MicrosoftAspNetCoreAppPackageVersion>3.1.3</MicrosoftAspNetCoreAppPackageVersion>
<MicrosoftAspNetCoreBlazorPackageVersion>3.2.0</MicrosoftAspNetCoreBlazorPackageVersion>
<MicrosoftBuildLocatorPackageVersion>1.2.2</MicrosoftBuildLocatorPackageVersion>
Expand All @@ -16,7 +16,7 @@
<MicrosoftTyePackageVersion>0.3.0-alpha.20319.3</MicrosoftTyePackageVersion>
<MicrosoftWin32RegistryLinePackageVersion>4.6.0</MicrosoftWin32RegistryLinePackageVersion>
<MoqPackageVersion>4.10.0</MoqPackageVersion>
<NewtonsoftJsonPackageVersion>12.0.2</NewtonsoftJsonPackageVersion>
<NewtonsoftJsonPackageVersion>12.0.3</NewtonsoftJsonPackageVersion>
<NunitPackageVersion>3.12.0</NunitPackageVersion>
<Nunit3TestAdapterPackageVersion>3.16.1</Nunit3TestAdapterPackageVersion>
<OpenTelemetryPackageVersion>0.4.0-beta.2</OpenTelemetryPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion examples/Microservicer/Backend/Backend.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ItemGroup>
<Protobuf Include="..\Proto\greet.proto" GrpcServices="Server" Link="Protos\greet.proto" />

<PackageReference Include="Grpc.AspNetCore" Version="$(GrpcPackageVersion)" />
<PackageReference Include="Grpc.AspNetCore" Version="$(GrpcDotNetPackageVersion)" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion perf/benchmarkapps/GrpcAspNetCoreServer/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime applicat
ms.Seek(0, SeekOrigin.Begin);

JsonSerializer serializer = new JsonSerializer();
var message = serializer.Deserialize<SimpleRequest>(new JsonTextReader(new StreamReader(ms)));
var message = serializer.Deserialize<SimpleRequest>(new JsonTextReader(new StreamReader(ms)))!;

ms.Seek(0, SeekOrigin.Begin);
using (var writer = new JsonTextWriter(new StreamWriter(ms, Encoding.UTF8, 1024, true)))
Expand Down
2 changes: 1 addition & 1 deletion testassets/Shared/InteropClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,7 @@ private static string GetEmailFromServiceAccountFile()
string keyFile = Environment.GetEnvironmentVariable("GOOGLE_APPLICATION_CREDENTIALS")!;
Assert.IsNotNull(keyFile);
var jobject = JObject.Parse(File.ReadAllText(keyFile));
string email = jobject.GetValue("client_email").Value<string>();
string email = jobject.GetValue("client_email")!.Value<string>();
Assert.IsTrue(email.Length > 0); // spec requires nonempty client email.
return email;
}
Expand Down

0 comments on commit 1b44bef

Please sign in to comment.