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 <johluo@microsoft.com>
This commit is contained in:
parent
326507bb01
commit
340ee72715
|
|
@ -251,11 +251,11 @@
|
||||||
<CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
|
<CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
|
||||||
<CommandLineParserPackageVersion>2.3.0</CommandLineParserPackageVersion>
|
<CommandLineParserPackageVersion>2.3.0</CommandLineParserPackageVersion>
|
||||||
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
|
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
|
||||||
<GoogleProtobufPackageVersion>3.10.0</GoogleProtobufPackageVersion>
|
<GoogleProtobufPackageVersion>3.13.0</GoogleProtobufPackageVersion>
|
||||||
<GrpcAspNetCorePackageVersion>2.27.0</GrpcAspNetCorePackageVersion>
|
<GrpcAspNetCorePackageVersion>2.32.0-pre1</GrpcAspNetCorePackageVersion>
|
||||||
<GrpcAuthPackageVersion>2.27.0</GrpcAuthPackageVersion>
|
<GrpcAuthPackageVersion>2.32.0-pre1</GrpcAuthPackageVersion>
|
||||||
<GrpcNetClientPackageVersion>2.27.0</GrpcNetClientPackageVersion>
|
<GrpcNetClientPackageVersion>2.32.0-pre1</GrpcNetClientPackageVersion>
|
||||||
<GrpcToolsPackageVersion>2.27.0</GrpcToolsPackageVersion>
|
<GrpcToolsPackageVersion>2.32.0-pre1</GrpcToolsPackageVersion>
|
||||||
<IdentityServer4AspNetIdentityPackageVersion>4.0.4</IdentityServer4AspNetIdentityPackageVersion>
|
<IdentityServer4AspNetIdentityPackageVersion>4.0.4</IdentityServer4AspNetIdentityPackageVersion>
|
||||||
<IdentityServer4EntityFrameworkPackageVersion>4.0.4</IdentityServer4EntityFrameworkPackageVersion>
|
<IdentityServer4EntityFrameworkPackageVersion>4.0.4</IdentityServer4EntityFrameworkPackageVersion>
|
||||||
<IdentityServer4PackageVersion>4.0.4</IdentityServer4PackageVersion>
|
<IdentityServer4PackageVersion>4.0.4</IdentityServer4PackageVersion>
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,22 @@ namespace InteropTests
|
||||||
{
|
{
|
||||||
using (var serverProcess = new WebsiteProcess(_serverPath, _output))
|
using (var serverProcess = new WebsiteProcess(_serverPath, _output))
|
||||||
{
|
{
|
||||||
await serverProcess.WaitForReady().TimeoutAfter(DefaultTimeout);
|
try
|
||||||
|
{
|
||||||
|
await serverProcess.WaitForReady().TimeoutAfter(DefaultTimeout);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
var errorMessage = $@"Error while running server process.
|
||||||
|
|
||||||
|
Server ready: {serverProcess.IsReady}
|
||||||
|
|
||||||
|
Server process output:
|
||||||
|
======================================
|
||||||
|
{serverProcess.GetOutput()}
|
||||||
|
======================================";
|
||||||
|
throw new InvalidOperationException(errorMessage, ex);
|
||||||
|
}
|
||||||
|
|
||||||
using (var clientProcess = new ClientProcess(_output, _clientPath, serverProcess.ServerPort, name))
|
using (var clientProcess = new ClientProcess(_output, _clientPath, serverProcess.ServerPort, name))
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,8 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ContainsFunctionalTestAssets>true</ContainsFunctionalTestAssets>
|
<ContainsFunctionalTestAssets>true</ContainsFunctionalTestAssets>
|
||||||
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
|
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
|
||||||
|
<TestDependsOnAspNetRuntime>true</TestDependsOnAspNetRuntime>
|
||||||
|
<IsWindowsOnlyTest>true</IsWindowsOnlyTest>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
|
||||||
|
|
@ -168,7 +168,7 @@ namespace InteropTestsClient
|
||||||
httpClientHandler.ClientCertificates.Add(cert);
|
httpClientHandler.ClientCertificates.Add(cert);
|
||||||
}
|
}
|
||||||
|
|
||||||
var httpClient = new HttpClient(new VersionPolicyHandler(httpClientHandler));
|
var httpClient = new HttpClient(httpClientHandler);
|
||||||
|
|
||||||
var channel = GrpcChannel.ForAddress($"{scheme}://{options.ServerHost}:{options.ServerPort}", new GrpcChannelOptions
|
var channel = GrpcChannel.ForAddress($"{scheme}://{options.ServerHost}:{options.ServerPort}", new GrpcChannelOptions
|
||||||
{
|
{
|
||||||
|
|
@ -180,21 +180,6 @@ namespace InteropTestsClient
|
||||||
return new GrpcChannelWrapper(channel);
|
return new GrpcChannelWrapper(channel);
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(JamesNK): This type can be removed in the future when Grpc.Net.Client sets VersionPolicy automatically.
|
|
||||||
// https://github.com/grpc/grpc-dotnet/pull/987
|
|
||||||
private class VersionPolicyHandler : DelegatingHandler
|
|
||||||
{
|
|
||||||
public VersionPolicyHandler(HttpMessageHandler innerHandler) : base(innerHandler)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
request.VersionPolicy = HttpVersionPolicy.RequestVersionOrHigher;
|
|
||||||
return base.SendAsync(request, cancellationToken);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<ChannelCredentials> CreateCredentialsAsync(bool? useTestCaOverride = null)
|
private async Task<ChannelCredentials> CreateCredentialsAsync(bool? useTestCaOverride = null)
|
||||||
{
|
{
|
||||||
var credentials = ChannelCredentials.Insecure;
|
var credentials = ChannelCredentials.Insecure;
|
||||||
|
|
@ -875,7 +860,7 @@ namespace InteropTestsClient
|
||||||
string keyFile = Environment.GetEnvironmentVariable("GOOGLE_APPLICATION_CREDENTIALS")!;
|
string keyFile = Environment.GetEnvironmentVariable("GOOGLE_APPLICATION_CREDENTIALS")!;
|
||||||
Assert.IsNotNull(keyFile);
|
Assert.IsNotNull(keyFile);
|
||||||
var jobject = JObject.Parse(File.ReadAllText(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.
|
Assert.IsTrue(email.Length > 0); // spec requires nonempty client email.
|
||||||
return email;
|
return email;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ using Grpc.Testing;
|
||||||
using Microsoft.AspNetCore.Builder;
|
using Microsoft.AspNetCore.Builder;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Microsoft.Extensions.Hosting;
|
using Microsoft.Extensions.Hosting;
|
||||||
|
using Microsoft.Net.Http.Headers;
|
||||||
|
|
||||||
namespace InteropTestsWebsite
|
namespace InteropTestsWebsite
|
||||||
{
|
{
|
||||||
|
|
@ -44,6 +45,8 @@ namespace InteropTestsWebsite
|
||||||
|
|
||||||
var runtimeVersion = typeof(object).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "Unknown";
|
var runtimeVersion = typeof(object).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "Unknown";
|
||||||
Console.WriteLine($"NetCoreAppVersion: {runtimeVersion}");
|
Console.WriteLine($"NetCoreAppVersion: {runtimeVersion}");
|
||||||
|
var aspNetCoreVersion = typeof(HeaderNames).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "Unknown";
|
||||||
|
Console.WriteLine($"AspNetCoreAppVersion: {aspNetCoreVersion}");
|
||||||
});
|
});
|
||||||
|
|
||||||
app.UseRouting();
|
app.UseRouting();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue