Merge branch 'main' into wasm_legacy_interop

Author: pavelsavara

eng/Version.Details.xml

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "9.0.100-alpha.1.23608.3"
+    "version": "9.0.100-alpha.1.23618.1"
   },
   "tools": {
-    "dotnet": "9.0.100-alpha.1.23608.3",
+    "dotnet": "9.0.100-alpha.1.23618.1",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"

eng/Versions.props

@@ -19,10 +19,12 @@
     <Compile Include="$(ComponentsSharedSourceRoot)src\HotReloadManager.cs" LinkBase="HotReload" />
     <Compile Include="$(SharedSourceRoot)LinkerFlags.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)QueryStringEnumerable.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Debugger\DictionaryItemDebugView.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Debugger\DictionaryDebugView.cs" LinkBase="Shared" />
   </ItemGroup>
 
   <Import Project="Microsoft.AspNetCore.Components.Routing.targets" />
-  
+
   <ItemGroup>
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />

global.json

@@ -728,7 +728,6 @@ private async Task TryNotifyClientErrorAsync(IClientProxy client, string error,
     internal Task UpdateRootComponents(
         RootComponentOperationBatch operationBatch,
         ProtectedPrerenderComponentApplicationStore store,
-        IServerComponentDeserializer serverComponentDeserializer,
         CancellationToken cancellation)
     {
         Log.UpdateRootComponentsStarted(_logger);

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

@@ -184,7 +184,7 @@ public async Task UpdateRootComponents(string serializedComponentOperations, str
             new ProtectedPrerenderComponentApplicationStore(applicationState, _dataProtectionProvider) :
             new ProtectedPrerenderComponentApplicationStore(_dataProtectionProvider);
 
-        _ = circuitHost.UpdateRootComponents(operations, store, _serverComponentSerializer, Context.ConnectionAborted);
+        _ = circuitHost.UpdateRootComponents(operations, store, Context.ConnectionAborted);
     }
 
     public async ValueTask<bool> ConnectCircuit(string circuitIdSecret)

src/Components/Server/src/Circuits/CircuitHost.cs

@@ -598,8 +598,7 @@ private async Task AddComponentAsync<TComponent>(CircuitHost circuitHost, int ss
         };
 
         // Add component
-        await circuitHost.UpdateRootComponents(
-            new() { Operations = [addOperation] }, null, CreateDeserializer(), CancellationToken.None);
+        await circuitHost.UpdateRootComponents(new() { Operations = [addOperation] }, null, CancellationToken.None);
     }
 
     private async Task UpdateComponentAsync<TComponent>(CircuitHost circuitHost, int ssrComponentId, Dictionary<string, object> parameters = null, string componentKey = "")
@@ -615,8 +614,7 @@ private async Task UpdateComponentAsync<TComponent>(CircuitHost circuitHost, int
         };
 
         // Update component
-        await circuitHost.UpdateRootComponents(
-            new() { Operations = [updateOperation] }, null, CreateDeserializer(), CancellationToken.None);
+        await circuitHost.UpdateRootComponents(new() { Operations = [updateOperation] }, null, CancellationToken.None);
     }
 
     private async Task RemoveComponentAsync(CircuitHost circuitHost, int ssrComponentId)
@@ -628,8 +626,7 @@ private async Task RemoveComponentAsync(CircuitHost circuitHost, int ssrComponen
         };
 
         // Remove component
-        await circuitHost.UpdateRootComponents(
-            new() { Operations = [removeOperation] }, null, CreateDeserializer(), CancellationToken.None);
+        await circuitHost.UpdateRootComponents(new() { Operations = [removeOperation] }, null, CancellationToken.None);
     }
 
     private ProtectedPrerenderComponentApplicationStore CreateStore()

src/Components/Server/src/ComponentHub.cs

@@ -161,6 +161,6 @@ private sealed class FeatureCollectionDebugView(FeatureCollection features)
         private readonly FeatureCollection _features = features;
 
         [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
-        public KeyValuePair<string, object>[] Items => _features.Select(pair => new KeyValuePair<string, object>(pair.Key.FullName ?? string.Empty, pair.Value)).ToArray();
+        public DictionaryItemDebugView<Type, object>[] Items => _features.Select(pair => new DictionaryItemDebugView<Type, object>(pair)).ToArray();
     }
 }

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

@@ -19,6 +19,7 @@ Microsoft.AspNetCore.Http.Features.FeatureCollection
     <Compile Include="$(SharedSourceRoot)ThrowHelpers\ArgumentNullThrowHelper.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)ThrowHelpers\ArgumentOutOfRangeThrowHelper.cs" LinkBase="Shared" />
     <Compile Include="$(SharedSourceRoot)CallerArgument\CallerArgumentExpressionAttribute.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)Debugger\DictionaryItemDebugView.cs" LinkBase="Shared" />
   </ItemGroup>
 
 </Project>

src/Extensions/Features/src/FeatureCollection.cs

@@ -108,6 +108,6 @@ private sealed class HttpContextFeatureDebugView(IFeatureCollection features)
         private readonly IFeatureCollection _features = features;
 
         [DebuggerBrowsable(DebuggerBrowsableState.RootHidden)]
-        public KeyValuePair<string, object>[] Items => _features.Select(pair => new KeyValuePair<string, object>(pair.Key.FullName ?? string.Empty, pair.Value)).ToArray();
+        public DictionaryItemDebugView<Type, object>[] Items => _features.Select(pair => new DictionaryItemDebugView<Type, object>(pair)).ToArray();
     }
 }