Skip to content

Commit 340ee72

Browse files
JamesNKJohn Luo
and
John Luo
authored
Update gRPC version in template to 2.32.0-pre1 (#25587)
* Update gRPC version in template to 2.32.0-pre1 * Log server timeout detail * Only run interop tests on windows queues Co-authored-by: John Luo <[email protected]>
1 parent 326507b commit 340ee72

File tree

5 files changed

+28
-23
lines changed

5 files changed

+28
-23
lines changed

eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,11 @@
251251
<CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
252252
<CommandLineParserPackageVersion>2.3.0</CommandLineParserPackageVersion>
253253
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
254-
<GoogleProtobufPackageVersion>3.10.0</GoogleProtobufPackageVersion>
255-
<GrpcAspNetCorePackageVersion>2.27.0</GrpcAspNetCorePackageVersion>
256-
<GrpcAuthPackageVersion>2.27.0</GrpcAuthPackageVersion>
257-
<GrpcNetClientPackageVersion>2.27.0</GrpcNetClientPackageVersion>
258-
<GrpcToolsPackageVersion>2.27.0</GrpcToolsPackageVersion>
254+
<GoogleProtobufPackageVersion>3.13.0</GoogleProtobufPackageVersion>
255+
<GrpcAspNetCorePackageVersion>2.32.0-pre1</GrpcAspNetCorePackageVersion>
256+
<GrpcAuthPackageVersion>2.32.0-pre1</GrpcAuthPackageVersion>
257+
<GrpcNetClientPackageVersion>2.32.0-pre1</GrpcNetClientPackageVersion>
258+
<GrpcToolsPackageVersion>2.32.0-pre1</GrpcToolsPackageVersion>
259259
<IdentityServer4AspNetIdentityPackageVersion>4.0.4</IdentityServer4AspNetIdentityPackageVersion>
260260
<IdentityServer4EntityFrameworkPackageVersion>4.0.4</IdentityServer4EntityFrameworkPackageVersion>
261261
<IdentityServer4PackageVersion>4.0.4</IdentityServer4PackageVersion>

src/Grpc/test/InteropTests/InteropTests.cs

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,22 @@ private async Task InteropTestCase(string name)
9090
{
9191
using (var serverProcess = new WebsiteProcess(_serverPath, _output))
9292
{
93-
await serverProcess.WaitForReady().TimeoutAfter(DefaultTimeout);
93+
try
94+
{
95+
await serverProcess.WaitForReady().TimeoutAfter(DefaultTimeout);
96+
}
97+
catch (Exception ex)
98+
{
99+
var errorMessage = $@"Error while running server process.
100+
101+
Server ready: {serverProcess.IsReady}
102+
103+
Server process output:
104+
======================================
105+
{serverProcess.GetOutput()}
106+
======================================";
107+
throw new InvalidOperationException(errorMessage, ex);
108+
}
94109

95110
using (var clientProcess = new ClientProcess(_output, _clientPath, serverProcess.ServerPort, name))
96111
{

src/Grpc/test/InteropTests/InteropTests.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<PropertyGroup>
44
<ContainsFunctionalTestAssets>true</ContainsFunctionalTestAssets>
55
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
6+
<TestDependsOnAspNetRuntime>true</TestDependsOnAspNetRuntime>
7+
<IsWindowsOnlyTest>true</IsWindowsOnlyTest>
68
</PropertyGroup>
79

810
<ItemGroup>

src/Grpc/test/testassets/InteropClient/InteropClient.cs

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ private async Task<IChannelWrapper> HttpClientCreateChannel()
168168
httpClientHandler.ClientCertificates.Add(cert);
169169
}
170170

171-
var httpClient = new HttpClient(new VersionPolicyHandler(httpClientHandler));
171+
var httpClient = new HttpClient(httpClientHandler);
172172

173173
var channel = GrpcChannel.ForAddress($"{scheme}://{options.ServerHost}:{options.ServerPort}", new GrpcChannelOptions
174174
{
@@ -180,21 +180,6 @@ private async Task<IChannelWrapper> HttpClientCreateChannel()
180180
return new GrpcChannelWrapper(channel);
181181
}
182182

183-
// TODO(JamesNK): This type can be removed in the future when Grpc.Net.Client sets VersionPolicy automatically.
184-
// https://github.com/grpc/grpc-dotnet/pull/987
185-
private class VersionPolicyHandler : DelegatingHandler
186-
{
187-
public VersionPolicyHandler(HttpMessageHandler innerHandler) : base(innerHandler)
188-
{
189-
}
190-
191-
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
192-
{
193-
request.VersionPolicy = HttpVersionPolicy.RequestVersionOrHigher;
194-
return base.SendAsync(request, cancellationToken);
195-
}
196-
}
197-
198183
private async Task<ChannelCredentials> CreateCredentialsAsync(bool? useTestCaOverride = null)
199184
{
200185
var credentials = ChannelCredentials.Insecure;
@@ -875,7 +860,7 @@ private static string GetEmailFromServiceAccountFile()
875860
string keyFile = Environment.GetEnvironmentVariable("GOOGLE_APPLICATION_CREDENTIALS")!;
876861
Assert.IsNotNull(keyFile);
877862
var jobject = JObject.Parse(File.ReadAllText(keyFile));
878-
string email = jobject.GetValue("client_email").Value<string>();
863+
string email = jobject.GetValue("client_email")!.Value<string>()!;
879864
Assert.IsTrue(email.Length > 0); // spec requires nonempty client email.
880865
return email;
881866
}

src/Grpc/test/testassets/InteropWebsite/Startup.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
using Microsoft.AspNetCore.Builder;
2323
using Microsoft.Extensions.DependencyInjection;
2424
using Microsoft.Extensions.Hosting;
25+
using Microsoft.Net.Http.Headers;
2526

2627
namespace InteropTestsWebsite
2728
{
@@ -44,6 +45,8 @@ public void Configure(IApplicationBuilder app, IHostApplicationLifetime applicat
4445

4546
var runtimeVersion = typeof(object).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "Unknown";
4647
Console.WriteLine($"NetCoreAppVersion: {runtimeVersion}");
48+
var aspNetCoreVersion = typeof(HeaderNames).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "Unknown";
49+
Console.WriteLine($"AspNetCoreAppVersion: {aspNetCoreVersion}");
4750
});
4851

4952
app.UseRouting();

0 commit comments

Comments
 (0)