[Blazor] Fix HotReloadManager accessibility in Server project by including shared source

src/Components/Components/src/PersistentState/PersistentServicesRegistry.cs

@@ -30,6 +30,7 @@ static PersistentServicesRegistry()
         if (HotReloadManager.Default.MetadataUpdateSupported)
         {
             HotReloadManager.Default.OnDeltaApplied += _cachedAccessorsByType.Clear;
+            HotReloadManager.Default.OnDeltaApplied += _persistentServiceTypeCache.Clear;
         }
     }
 

src/Components/Server/src/Circuits/ServerComponentDeserializer.cs

@@ -5,6 +5,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using System.Text.Json;
+using Microsoft.AspNetCore.Components.HotReload;
 using Microsoft.AspNetCore.DataProtection;
 using Microsoft.Extensions.Logging;
 
@@ -57,11 +58,21 @@
 //  * If a marker can't be unprotected we will fail early. We know that the marker was tampered with and can't be trusted.
 internal sealed partial class ServerComponentDeserializer : IServerComponentDeserializer
 {
+    private static readonly RootTypeCache _rootTypeCache = new();
     private readonly IDataProtector _dataProtector;
     private readonly ILogger<ServerComponentDeserializer> _logger;
-    private readonly RootTypeCache _RootTypeCache;
     private readonly ComponentParameterDeserializer _parametersDeserializer;
 
+    static ServerComponentDeserializer()
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += _rootTypeCache.Clear;
+        }
+    }
+
+
+
     // The following fields are only used in TryDeserializeSingleComponentDescriptor.
     // The TryDeserializeComponentDescriptorCollection method uses a stateless
     // approach to efficiently detect invalid component records.
@@ -72,7 +83,6 @@
     public ServerComponentDeserializer(
         IDataProtectionProvider dataProtectionProvider,
         ILogger<ServerComponentDeserializer> logger,
-        RootTypeCache RootTypeCache,
         ComponentParameterDeserializer parametersDeserializer)
     {
         // When we protect the data we use a time-limited data protector with the
@@ -87,7 +97,6 @@
             .ToTimeLimitedDataProtector();
 
         _logger = logger;
-        _RootTypeCache = RootTypeCache;
         _parametersDeserializer = parametersDeserializer;
     }
 
@@ -206,7 +215,7 @@
     private bool TryDeserializeComponentTypeAndParameters(ServerComponent serverComponent, [NotNullWhen(true)] out Type? componentType, out ParameterView parameters)
     {
         parameters = default;
-        componentType = _RootTypeCache
+        componentType = _rootTypeCache
             .GetRootType(serverComponent.AssemblyName, serverComponent.TypeName);
 
         if (componentType == null)

src/Components/Server/src/DependencyInjection/ComponentServiceCollectionExtensions.cs

@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Endpoints;
 using Microsoft.AspNetCore.Components.Forms;
+using Microsoft.AspNetCore.Components.HotReload;
 using Microsoft.AspNetCore.Components.Routing;
 using Microsoft.AspNetCore.Components.Server;
 using Microsoft.AspNetCore.Components.Server.BlazorPack;
@@ -67,7 +68,12 @@ public static IServerSideBlazorBuilder AddServerSideBlazor(this IServiceCollecti
         services.TryAddSingleton<CircuitMetrics>();
         services.TryAddSingleton<ICircuitFactory, CircuitFactory>();
         services.TryAddSingleton<ICircuitHandleRegistry, CircuitHandleRegistry>();
-        services.TryAddSingleton<RootTypeCache>();
+        services.TryAddSingleton<RootTypeCache>(serviceProvider =>
+        {
+            var cache = new RootTypeCache();
+            RegisterForHotReload(cache);
+            return cache;
+        });
         services.TryAddSingleton<ComponentParameterDeserializer>();
         services.TryAddSingleton<ComponentParametersTypeCache>();
         services.TryAddSingleton<CircuitIdFactory>();
@@ -124,6 +130,14 @@ public static IServerSideBlazorBuilder AddServerSideBlazor(this IServiceCollecti
         return builder;
     }
 
+    private static void RegisterForHotReload(RootTypeCache cache)
+    {
+        if (HotReloadManager.Default.MetadataUpdateSupported)
+        {
+            HotReloadManager.Default.OnDeltaApplied += cache.Clear;
+        }
+    }
+
     private sealed class DefaultServerSideBlazorBuilder : IServerSideBlazorBuilder
     {
         public DefaultServerSideBlazorBuilder(IServiceCollection services)

src/Components/Server/src/Microsoft.AspNetCore.Components.Server.csproj

@@ -51,6 +51,7 @@
     <Compile Include="$(ComponentsSharedSourceRoot)src\RootComponentOperationBatch.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\RootComponentOperationType.cs" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\RootTypeCache.cs" />
+    <Compile Include="$(ComponentsSharedSourceRoot)src\HotReloadManager.cs" LinkBase="HotReload" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\DefaultAntiforgeryStateProvider.cs" LinkBase="Forms" />
     <Compile Include="$(ComponentsSharedSourceRoot)src\WebRendererId.cs" />
     <Compile Include="$(SharedSourceRoot)Components\ServerComponentSerializer.cs" LinkBase="DependencyInjection" />

src/Components/Server/test/Circuits/CircuitHostTest.cs

@@ -834,7 +834,7 @@ private ProtectedPrerenderComponentApplicationStore CreateStore()
 
     private ServerComponentDeserializer CreateDeserializer()
     {
-        return new ServerComponentDeserializer(_ephemeralDataProtectionProvider, NullLogger<ServerComponentDeserializer>.Instance, new RootTypeCache(), new ComponentParameterDeserializer(NullLogger<ComponentParameterDeserializer>.Instance, new ComponentParametersTypeCache()));
+        return new ServerComponentDeserializer(_ephemeralDataProtectionProvider, NullLogger<ServerComponentDeserializer>.Instance, new ComponentParameterDeserializer(NullLogger<ComponentParameterDeserializer>.Instance, new ComponentParametersTypeCache()));
     }
 
     private static TestRemoteRenderer GetRemoteRenderer()

src/Components/Server/test/Circuits/CircuitPersistenceManagerTest.cs

@@ -474,7 +474,6 @@ await circuitHost.UpdateRootComponents(
     private static ServerComponentDeserializer CreateDeserializer(EphemeralDataProtectionProvider dataProtectionProvider) => new ServerComponentDeserializer(
                     dataProtectionProvider,
                     NullLoggerFactory.Instance.CreateLogger<ServerComponentDeserializer>(),
-                    new RootTypeCache(),
                     new ComponentParameterDeserializer(
                         NullLoggerFactory.Instance.CreateLogger<ComponentParameterDeserializer>(),
                         new ComponentParametersTypeCache()));

src/Components/Server/test/Circuits/RemoteRendererTest.cs

@@ -646,7 +646,6 @@ private TestRemoteRenderer GetRemoteRenderer(IServiceProvider serviceProvider, C
         var serverComponentDeserializer = new ServerComponentDeserializer(
             _ephemeralDataProtectionProvider,
             NullLogger<ServerComponentDeserializer>.Instance,
-            new RootTypeCache(),
             new ComponentParameterDeserializer(
                 NullLogger<ComponentParameterDeserializer>.Instance,
                 new ComponentParametersTypeCache()));

src/Components/Server/test/Circuits/ServerComponentDeserializerTest.cs

@@ -436,7 +436,6 @@ private ServerComponentDeserializer CreateServerComponentDeserializer()
         return new ServerComponentDeserializer(
             _ephemeralDataProtectionProvider,
             NullLogger<ServerComponentDeserializer>.Instance,
-            new RootTypeCache(),
             new ComponentParameterDeserializer(NullLogger<ComponentParameterDeserializer>.Instance, new ComponentParametersTypeCache()));
     }
 

src/Components/Shared/src/RootTypeCache.cs

@@ -5,17 +5,22 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
-#if COMPONENTS
-namespace Microsoft.AspNetCore.Components.Infrastructure;
-#else
 namespace Microsoft.AspNetCore.Components;
-#endif
 
 // A cache for root component types
 internal sealed class RootTypeCache
 {
     private readonly ConcurrentDictionary<Key, Type?> _typeToKeyLookUp = new();
 
+    public RootTypeCache()
+    {
+    }
+
+    internal void Clear()
+    {
+        _typeToKeyLookUp.Clear();
+    }
+
     public Type? GetRootType(string assembly, string type)
     {
         var key = new Key(assembly, type);

src/Components/WebAssembly/WebAssembly/src/Hosting/WebAssemblyHostBuilder.cs

@@ -28,7 +28,6 @@ public sealed class WebAssemblyHostBuilder
 {
     private readonly IInternalJSImportMethods _jsMethods;
     private Func<IServiceProvider> _createServiceProvider;
-    private RootTypeCache? _rootComponentCache;
     private string? _persistedState;
     private ServiceProviderOptions? _serviceProviderOptions;
 
@@ -146,11 +145,10 @@ private void InitializeRegisteredRootComponents()
             registeredComponents[i].PrerenderId = i.ToString(CultureInfo.InvariantCulture);
         }
 
-        _rootComponentCache = new RootTypeCache();
         var componentDeserializer = WebAssemblyComponentParameterDeserializer.Instance;
         foreach (var registeredComponent in registeredComponents)
         {
-            var componentType = _rootComponentCache.GetRootType(registeredComponent.Assembly!, registeredComponent.TypeName!);
+            var componentType = DefaultWebAssemblyJSRuntime._rootComponentCache.GetRootType(registeredComponent.Assembly!, registeredComponent.TypeName!);
             if (componentType is null)
             {
                 throw new InvalidOperationException(
@@ -323,7 +321,10 @@ internal void InitializeDefaultServices()
         Services.AddSingleton<IScrollToLocationHash>(WebAssemblyScrollToLocationHash.Instance);
         Services.AddSingleton(_jsMethods);
         Services.AddSingleton(new LazyAssemblyLoader(DefaultWebAssemblyJSRuntime.Instance));
-        Services.AddSingleton(_ => _rootComponentCache ?? new());
+        Services.AddSingleton(serviceProvider =>
+        {
+            return new RootTypeCache();
+        });
         Services.AddSingleton<ComponentStatePersistenceManager>();
         Services.AddSingleton(sp => sp.GetRequiredService<ComponentStatePersistenceManager>().State);
         Services.AddSupplyValueFromPersistentComponentStateProvider();

src/Components/WebAssembly/WebAssembly/src/Services/DefaultWebAssemblyJSRuntime.cs

@@ -20,7 +20,7 @@ internal sealed partial class DefaultWebAssemblyJSRuntime : WebAssemblyJSRuntime
 {
     public static readonly DefaultWebAssemblyJSRuntime Instance = new();
 
-    private readonly RootTypeCache _rootComponentCache = new();
+    internal static readonly RootTypeCache _rootComponentCache = new();
 
     public ElementReferenceContext ElementReferenceContext { get; }
 
@@ -131,7 +131,7 @@ internal static RootComponentOperationBatch DeserializeOperations(string operati
                 throw new InvalidOperationException($"The component operation of type '{operation.Type}' requires a '{nameof(operation.Marker)}' to be specified.");
             }
 
-            var componentType = Instance._rootComponentCache.GetRootType(operation.Marker!.Value.Assembly!, operation.Marker.Value.TypeName!)
+            var componentType = _rootComponentCache.GetRootType(operation.Marker!.Value.Assembly!, operation.Marker.Value.TypeName!)
                 ?? throw new InvalidOperationException($"Root component type '{operation.Marker.Value.TypeName}' could not be found in the assembly '{operation.Marker.Value.Assembly}'.");
             var parameters = DeserializeComponentParameters(operation.Marker.Value);
             operation.Descriptor = new(componentType, parameters);