Fix gRPC interop tests (#24824)

src/Grpc/test/InteropTests/InteropTests.csproj

@@ -3,9 +3,6 @@
   <PropertyGroup>
     <ContainsFunctionalTestAssets>true</ContainsFunctionalTestAssets>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
-
-    <!-- https://github.com/dotnet/aspnetcore/issues/24182 -->
-    <BuildHelixPayload>false</BuildHelixPayload>
   </PropertyGroup>
 
   <ItemGroup>

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

@@ -29,7 +29,6 @@ using Google.Apis.Auth.OAuth2;
 using Google.Protobuf;
 using Grpc.Auth;
 using Grpc.Core;
-using Grpc.Core.Utils;
 using Grpc.Net.Client;
 using Grpc.Testing;
 using Microsoft.Extensions.DependencyInjection;
@@ -96,11 +95,12 @@ namespace InteropTestsClient
             var services = new ServiceCollection();
             services.AddLogging(configure =>
             {
-                configure.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace);
+                configure.SetMinimumLevel(LogLevel.Trace);
-                configure.AddSimpleConsole(loggerOptions =>
+                configure.AddConsole(loggerOptions =>
                 {
+#pragma warning disable CS0618 // Type or member is obsolete
                     loggerOptions.IncludeScopes = true;
-                    loggerOptions.DisableColors = true;
+#pragma warning restore CS0618 // Type or member is obsolete
                 });
             });
 

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

@@ -17,6 +17,7 @@
 #endregion
 
 using System;
+using System.Reflection;
 
 namespace InteropTestsClient
 {
@@ -26,6 +27,9 @@ namespace InteropTestsClient
         {
             Console.WriteLine("Application started.");
 
+            var runtimeVersion = typeof(object).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "Unknown";
+            Console.WriteLine($"NetCoreAppVersion: {runtimeVersion}");
+
             InteropClient.Run(args);
         }
     }

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

@@ -37,7 +37,7 @@ namespace InteropTestsWebsite
             Host.CreateDefaultBuilder(args)
                 .ConfigureLogging(builder =>
                 {
-                    builder.AddSimpleConsole(o => o.DisableColors = true);
+                    builder.AddConsole();
                     builder.SetMinimumLevel(LogLevel.Trace);
                 })
                 .ConfigureWebHostDefaults(webBuilder =>

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

@@ -17,6 +17,7 @@
 #endregion
 
 using System;
+using System.Reflection;
 using Grpc.Testing;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
@@ -37,7 +38,13 @@ namespace InteropTestsWebsite
         public void Configure(IApplicationBuilder app, IHostApplicationLifetime applicationLifetime)
         {
             // Required to notify test infrastructure that it can begin tests
-            applicationLifetime.ApplicationStarted.Register(() => Console.WriteLine("Application started."));
+            applicationLifetime.ApplicationStarted.Register(() =>
+            {
+                Console.WriteLine("Application started.");
+
+                var runtimeVersion = typeof(object).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>()?.InformationalVersion ?? "Unknown";
+                Console.WriteLine($"NetCoreAppVersion: {runtimeVersion}");
+            });
 
             app.UseRouting();
             app.UseEndpoints(endpoints =>

src/Shared/Process/ProcessEx.cs

@@ -218,8 +218,8 @@ namespace Microsoft.AspNetCore.Internal
         private static string GetNugetPackagesRestorePath() => (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("NUGET_RESTORE")))
             ? typeof(ProcessEx).Assembly
                 .GetCustomAttributes<AssemblyMetadataAttribute>()
-                .First(attribute => attribute.Key == "TestPackageRestorePath")
+                .FirstOrDefault(attribute => attribute.Key == "TestPackageRestorePath")
-                .Value
+                ?.Value
             : Environment.GetEnvironmentVariable("NUGET_RESTORE");
 
         public void Dispose()