Support configuring hub options

Author: javiercn

src/Components/Endpoints/src/DependencyInjection/IRazorComponentsBuilder.cs

@@ -6,12 +6,12 @@
 namespace Microsoft.AspNetCore.Components.Endpoints;
 
 /// <summary>
-/// 
+/// A builder that can be used to configure Razor Components.
 /// </summary>
 public interface IRazorComponentsBuilder
 {
     /// <summary>
-    /// 
+    /// Gets the <see cref="IServiceCollection"/>.
     /// </summary>
     public IServiceCollection Services { get; }
 }

src/Components/Server/src/DependencyInjection/IServerSideBlazorBuilder.cs

@@ -1,15 +1,19 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using Microsoft.AspNetCore.Components.Endpoints;
+
 namespace Microsoft.Extensions.DependencyInjection;
 
 /// <summary>
 /// A builder that can be used to configure Server-Side Blazor.
 /// </summary>
-public interface IServerSideBlazorBuilder
+public interface IServerSideBlazorBuilder : IRazorComponentsBuilder
 {
     /// <summary>
     /// Gets the <see cref="IServiceCollection"/>.
     /// </summary>
-    IServiceCollection Services { get; }
+    public new IServiceCollection Services { get; }
+
+    IServiceCollection IRazorComponentsBuilder.Services => Services;
 }

src/Components/Server/src/DependencyInjection/RazorComponentsBuilderExtensions.cs

@@ -25,14 +25,24 @@ public static class RazorComponentsBuilderExtensions
     /// <param name="configure">A callback to configure <see cref="CircuitOptions"/>.</param>
     /// <returns>An <see cref="IRazorComponentsBuilder"/> that can be used to further customize the configuration.</returns>
     [RequiresUnreferencedCode("Server-side Blazor does not currently support native AOT.", Url = "https://aka.ms/aspnet/nativeaot")]
-    public static IRazorComponentsBuilder AddServerComponents(this IRazorComponentsBuilder builder, Action<CircuitOptions>? configure = null)
+    public static IServerSideBlazorBuilder AddServerComponents(this IRazorComponentsBuilder builder, Action<CircuitOptions>? configure = null)
     {
         ArgumentNullException.ThrowIfNull(builder, nameof(builder));
 
         builder.Services.AddServerSideBlazor(configure);
         builder.Services.TryAddEnumerable(ServiceDescriptor.Singleton<RenderModeEndpointProvider, CircuitEndpointProvider>());
 
-        return builder;
+        return new DefaultServerSideBlazorBuilder(builder.Services);
+    }
+
+    private sealed class DefaultServerSideBlazorBuilder : IServerSideBlazorBuilder
+    {
+        public DefaultServerSideBlazorBuilder(IServiceCollection services)
+        {
+            Services = services;
+        }
+
+        public IServiceCollection Services { get; }
     }
 
     private class CircuitEndpointProvider : RenderModeEndpointProvider

src/Components/Server/src/PublicAPI.Unshipped.txt

@@ -2,5 +2,5 @@
 Microsoft.AspNetCore.Components.Server.Circuits.CircuitInboundActivityContext
 Microsoft.AspNetCore.Components.Server.Circuits.CircuitInboundActivityContext.Circuit.get -> Microsoft.AspNetCore.Components.Server.Circuits.Circuit!
 Microsoft.Extensions.DependencyInjection.RazorComponentsBuilderExtensions
-static Microsoft.Extensions.DependencyInjection.RazorComponentsBuilderExtensions.AddServerComponents(this Microsoft.AspNetCore.Components.Endpoints.IRazorComponentsBuilder! builder, System.Action<Microsoft.AspNetCore.Components.Server.CircuitOptions!>? configure = null) -> Microsoft.AspNetCore.Components.Endpoints.IRazorComponentsBuilder!
+static Microsoft.Extensions.DependencyInjection.RazorComponentsBuilderExtensions.AddServerComponents(this Microsoft.AspNetCore.Components.Endpoints.IRazorComponentsBuilder! builder, System.Action<Microsoft.AspNetCore.Components.Server.CircuitOptions!>? configure = null) -> Microsoft.Extensions.DependencyInjection.IServerSideBlazorBuilder!
 virtual Microsoft.AspNetCore.Components.Server.Circuits.CircuitHandler.CreateInboundActivityHandler(System.Func<Microsoft.AspNetCore.Components.Server.Circuits.CircuitInboundActivityContext!, System.Threading.Tasks.Task!>! next) -> System.Func<Microsoft.AspNetCore.Components.Server.Circuits.CircuitInboundActivityContext!, System.Threading.Tasks.Task!>!