Fix tests

Author: JamesNK

src/Grpc.AspNetCore.Server/GrpcServiceExtensions.cs

@@ -58,13 +58,14 @@ public static IGrpcServerBuilder AddGrpc(this IServiceCollection services)
     {
         ArgumentNullThrowHelper.ThrowIfNull(services);
 
-        // Configure route options directly. Depend on the host to call AddRouting/AddRoutingCore.
-        services.Configure<RouteOptions>(options =>
-        {
-            // Unimplemented constraint is added to the route as an inline constraint to avoid RoutePatternFactory.Parse overload that includes parameter policies. That overload infers strings as regex constraints, which brings in
-            // the regex engine when publishing trimmed or AOT apps. This change reduces Native AOT gRPC server app size by about 1 MB.
-            AddParameterPolicy<GrpcUnimplementedConstraint>(options, GrpcServerConstants.GrpcUnimplementedConstraintPrefix);
-        });
+#if NET8_0_OR_GREATER
+        // Prefer AddRoutingCore when available.
+        // AddRoutingCore doesn't register a regex constraint and produces smaller result from trimming.
+        services.AddRoutingCore();
+        services.Configure<RouteOptions>(ConfigureRouting);
+#else
+        services.AddRouting(ConfigureRouting);
+#endif
         services.AddOptions();
         services.TryAddSingleton<GrpcMarkerService>();
         services.TryAddSingleton(typeof(ServerCallHandlerFactory<>));
@@ -79,6 +80,13 @@ public static IGrpcServerBuilder AddGrpc(this IServiceCollection services)
 
         return new GrpcServerBuilder(services);
 
+        static void ConfigureRouting(RouteOptions options)
+        {
+            // Unimplemented constraint is added to the route as an inline constraint to avoid RoutePatternFactory.Parse overload that includes parameter policies. That overload infers strings as regex constraints, which brings in
+            // the regex engine when publishing trimmed or AOT apps. This change reduces Native AOT gRPC server app size by about 1 MB.
+            AddParameterPolicy<GrpcUnimplementedConstraint>(options, GrpcServerConstants.GrpcUnimplementedConstraintPrefix);
+        }
+
         // This ensures the policy's constructors are preserved in .NET 6 with trimming. Remove when .NET 6 is no longer supported.
         static void AddParameterPolicy<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors)] T>(RouteOptions options, string name)
             where T : IParameterPolicy

testassets/LinkerTestsClient/LinkerTestsClient.csproj

@@ -6,8 +6,8 @@
     <PublishTrimmed>true</PublishTrimmed>
     <PublishAot>$(AppPublishAot)</PublishAot>
 
-    <IlcGenerateMstatFile>true</IlcGenerateMstatFile>
-    <IlcGenerateDgmlFile>true</IlcGenerateDgmlFile>
+    <IlcGenerateMstatFile>$(GenerateAotDiaganostics)</IlcGenerateMstatFile>
+    <IlcGenerateDgmlFile>$(GenerateAotDiaganostics)</IlcGenerateDgmlFile>
   </PropertyGroup>
 
   <ItemGroup>

testassets/LinkerTestsWebsite/LinkerTestsWebsite.csproj

@@ -12,8 +12,8 @@
     <TrimMode>full</TrimMode>
     <TrimmerSingleWarn>false</TrimmerSingleWarn>
 
-    <IlcGenerateMstatFile>true</IlcGenerateMstatFile>
-    <IlcGenerateDgmlFile>true</IlcGenerateDgmlFile>
+    <IlcGenerateMstatFile>$(GenerateAotDiaganostics)</IlcGenerateMstatFile>
+    <IlcGenerateDgmlFile>$(GenerateAotDiaganostics)</IlcGenerateDgmlFile>
   </PropertyGroup>
 
   <ItemGroup>