Fix internal shared assemblies with static mapping.

Author: ilonatommy

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

@@ -206,13 +206,28 @@ public PropertiesAccessor([DynamicallyAccessedMembers(LinkerFlags.Component)] Ty
 
         public (string, Type)[] KeyTypePairs => _cachedKeysForService;
 
+        // Mapping for internal classes bundled in different assemblies during prerendering and WASM rendering.
+        private static readonly Dictionary<string, string> _canonicalMap = new(StringComparer.OrdinalIgnoreCase)
+        {
+            { "Microsoft.AspNetCore.Components.Endpoints", "Microsoft.AspNetCore.Components" },
+            { "Microsoft.AspNetCore.Components.WebAssembly", "Microsoft.AspNetCore.Components" }
+        };
+
         private static string ComputeKey(Type keyType, string propertyName)
         {
             // This happens once per type and property combo, so allocations are ok.
             var assemblyName = keyType.Assembly.FullName;
+            var assemblySimpleName = keyType.Assembly.GetName().Name ?? "";
+            if (_canonicalMap.TryGetValue(assemblySimpleName, out var canonicalAssembly))
+            {
+                assemblyName = canonicalAssembly;
+            }
+
             var typeName = keyType.FullName;
-            var input = Encoding.UTF8.GetBytes(string.Join(".", assemblyName, typeName, propertyName));
-            return Convert.ToBase64String(SHA256.HashData(input));
+            var inputString = string.Join(".", assemblyName, typeName, propertyName);
+            var input = Encoding.UTF8.GetBytes(inputString);
+            var hash = SHA256.HashData(input);
+            return Convert.ToBase64String(hash);
         }
 
         internal static IEnumerable<PropertyInfo> GetCandidateBindableProperties(

src/Components/Endpoints/src/Rendering/EndpointHtmlRenderer.cs

@@ -149,7 +149,7 @@ private static void InitializeResourceCollection(HttpContext httpContext)
         var resourceCollectionProvider = resourceCollectionUrl != null ? httpContext.RequestServices.GetService<ResourceCollectionProvider>() : null;
         if (resourceCollectionUrl != null && resourceCollectionProvider != null)
         {
-            resourceCollectionProvider.SetResourceCollectionUrl(resourceCollectionUrl.Url);
+            resourceCollectionProvider.ResourceCollectionUrl = resourceCollectionUrl.Url;
             resourceCollectionProvider.SetResourceCollection(resourceCollection ?? ResourceAssetCollection.Empty);
         }
     }

src/Components/Shared/src/ResourceCollectionProvider.cs

@@ -17,25 +17,23 @@ internal class ResourceCollectionProvider
     public string? ResourceCollectionUrl
     {
         get => _url;
-        set => _url = value;
+        set
+        {
+            if (_url != null)
+            {
+                throw new InvalidOperationException("The resource collection URL has already been set.");
+            }
+            _url = value;
+        }
     }
+
     private ResourceAssetCollection? _resourceCollection;
     private readonly IJSRuntime _jsRuntime;
     public ResourceCollectionProvider(IJSRuntime jsRuntime)
     {
         _jsRuntime = jsRuntime;
     }
 
-    [MemberNotNull(nameof(_url))]
-    internal void SetResourceCollectionUrl(string url)
-    {
-        if (_url != null)
-        {
-            throw new InvalidOperationException("The resource collection URL has already been set.");
-        }
-        _url = url;
-    }
-
     internal async Task<ResourceAssetCollection> GetResourceCollection()
     {
         _resourceCollection = _resourceCollection ??= await LoadResourceCollection();
@@ -58,6 +56,8 @@ private async Task<ResourceAssetCollection> LoadResourceCollection()
 
         var module = await _jsRuntime.InvokeAsync<IJSObjectReference>("import", _url);
         var result = await module.InvokeAsync<ResourceAsset[]>("get");
-        return result == null ? ResourceAssetCollection.Empty : new ResourceAssetCollection(result);
+        var collection = result == null ? ResourceAssetCollection.Empty : new ResourceAssetCollection(result);
+        var asset = collection["BasicTestApp.styles.css"];
+        return collection;
     }
 }