Fix build

Author: javiercn

src/Components/Components/src/PersistentState/WebPersistenceFilter.cs

@@ -38,6 +38,9 @@ internal WebPersistenceFilter(WebPersistenceScenarioType scenarioType, bool enab
     /// </example>
     public static WebPersistenceFilter Reconnection { get; } = new(WebPersistenceScenarioType.Reconnection, enabled: true);
 
+    /// <summary>
+    /// Gets a filter that enables state restoration during enhanced navigation scenarios.
+    /// </summary>
     public static WebPersistenceFilter EnhancedNavigation { get; } = new(WebPersistenceScenarioType.EnhancedNavigation, enabled: true);
 
     /// <summary>

src/Components/Components/src/PersistentState/WebPersistenceScenario.cs

@@ -51,6 +51,10 @@ private WebPersistenceScenario(WebPersistenceScenarioType scenarioType, bool isR
     /// </example>
     public static WebPersistenceScenario Reconnection { get; } = new(WebPersistenceScenarioType.Reconnection, isRecurring: false);
 
+    /// <summary>
+    /// Gets a scenario representing enhanced navigation state restoration.
+    /// This scenario can occur multiple times during enhanced page navigation.
+    /// </summary>
     public static WebPersistenceScenario EnhancedNavigation { get; } = new(WebPersistenceScenarioType.EnhancedNavigation, isRecurring: true);
 
     private string GetDebuggerDisplay() => $"{ScenarioType} (IsRecurring: {IsRecurring})";

src/Components/Components/src/PersistentStateValueProvider.cs

@@ -52,9 +52,6 @@ public bool CanSupplyValue(in CascadingParameterInfo parameterInfo)
         return null;
     }
 
-    [UnconditionalSuppressMessage("Trimming", "IL2075:'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations.", Justification = "OpenComponent already has the right set of attributes")]
-    [UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "OpenComponent already has the right set of attributes")]
-    [UnconditionalSuppressMessage("Trimming", "IL2072:Target parameter argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations.", Justification = "OpenComponent already has the right set of attributes")]
     public void Subscribe(ComponentState subscriber, in CascadingParameterInfo parameterInfo)
     {
         var propertyName = parameterInfo.PropertyName;
@@ -446,6 +443,10 @@ public ComponentSubscription(
             return _lastValue;
         }
 
+        [UnconditionalSuppressMessage("Trimming", "IL2075:'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations.", Justification = "OpenComponent already has the right set of attributes")]
+        [UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "OpenComponent already has the right set of attributes")]
+        [UnconditionalSuppressMessage("Trimming", "IL2072:Target parameter argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations.", Justification = "OpenComponent already has the right set of attributes")]
+        [UnconditionalSuppressMessage("Trimming", "IL2077:'type' argument does not satisfy 'DynamicallyAccessedMemberTypes' in call to target method. The source field does not have matching annotations.", Justification = "Property types on components are preserved through other means.")]
         private Task PersistProperty()
         {
             // The key needs to be computed here, do not move this outside of the lambda.
@@ -474,6 +475,10 @@ private Task PersistProperty()
             return Task.CompletedTask;
         }
 
+        [UnconditionalSuppressMessage("Trimming", "IL2075:'this' argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations.", Justification = "OpenComponent already has the right set of attributes")]
+        [UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "OpenComponent already has the right set of attributes")]
+        [UnconditionalSuppressMessage("Trimming", "IL2072:Target parameter argument does not satisfy 'DynamicallyAccessedMembersAttribute' in call to target method. The return value of the source method does not have matching annotations.", Justification = "OpenComponent already has the right set of attributes")]
+        [UnconditionalSuppressMessage("Trimming", "IL2077:'type' argument does not satisfy 'DynamicallyAccessedMemberTypes' in call to target method. The source field does not have matching annotations.", Justification = "Property types on components are preserved through other means.")]
         private void RestoreProperty()
         {
             if (!_hasComputedValueFirstTime)

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

@@ -22,9 +22,13 @@ Microsoft.AspNetCore.Components.PersistentComponentStateSerializer<T>
 Microsoft.AspNetCore.Components.PersistentComponentStateSerializer<T>.PersistentComponentStateSerializer() -> void
 abstract Microsoft.AspNetCore.Components.PersistentComponentStateSerializer<T>.Persist(T value, System.Buffers.IBufferWriter<byte>! writer) -> void
 abstract Microsoft.AspNetCore.Components.PersistentComponentStateSerializer<T>.Restore(System.Buffers.ReadOnlySequence<byte> data) -> T
+Microsoft.AspNetCore.Components.UpdateStateOnEnhancedNavigation
+Microsoft.AspNetCore.Components.UpdateStateOnEnhancedNavigation.UpdateStateOnEnhancedNavigation(bool enable = false) -> void
 static Microsoft.AspNetCore.Components.Infrastructure.RegisterPersistentComponentStateServiceCollectionExtensions.AddPersistentServiceRegistration<TService>(Microsoft.Extensions.DependencyInjection.IServiceCollection! services, Microsoft.AspNetCore.Components.IComponentRenderMode! componentRenderMode) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 static Microsoft.AspNetCore.Components.Infrastructure.ComponentsMetricsServiceCollectionExtensions.AddComponentsMetrics(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 static Microsoft.AspNetCore.Components.Infrastructure.ComponentsMetricsServiceCollectionExtensions.AddComponentsTracing(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
+static Microsoft.AspNetCore.Components.WebPersistenceFilter.EnhancedNavigation.get -> Microsoft.AspNetCore.Components.WebPersistenceFilter!
+static Microsoft.AspNetCore.Components.WebPersistenceScenario.EnhancedNavigation.get -> Microsoft.AspNetCore.Components.WebPersistenceScenario!
 virtual Microsoft.AspNetCore.Components.OwningComponentBase.DisposeAsyncCore() -> System.Threading.Tasks.ValueTask
 static Microsoft.AspNetCore.Components.Infrastructure.PersistentStateProviderServiceCollectionExtensions.AddSupplyValueFromPersistentComponentStateProvider(this Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> Microsoft.Extensions.DependencyInjection.IServiceCollection!
 virtual Microsoft.AspNetCore.Components.Rendering.ComponentState.GetComponentKey() -> object?

src/Components/Components/test/PersistentStateValueProviderTests.cs

@@ -757,8 +757,8 @@ public void Subscribe_WithRestoreOnPrerenderingAttribute_CreatesCorrectSubscript
         provider.Subscribe(componentState, cascadingParameterInfo);
 
         // Assert
-        Assert.True(provider.Subscriptions.ContainsKey((componentState, nameof(TestComponentWithFilteredState.PrerenderState))));
-        var subscription = provider.Subscriptions[(componentState, nameof(TestComponentWithFilteredState.PrerenderState))];
+        Assert.True(provider.Subscriptions.ContainsKey(new(componentState, nameof(TestComponentWithFilteredState.PrerenderState))));
+        var subscription = provider.Subscriptions[new(componentState, nameof(TestComponentWithFilteredState.PrerenderState))];
     }
 
     [Fact]
@@ -781,16 +781,16 @@ public void Subscribe_WithFilteredProperty_CreatesValidSubscription()
 
         // Act & Assert - Subscribe to prerender state
         provider.Subscribe(componentState, prerenderInfo);
-        Assert.True(provider.Subscriptions.ContainsKey((componentState, nameof(TestComponentWithFilteredState.PrerenderState))));
+        Assert.True(provider.Subscriptions.ContainsKey(new(componentState, nameof(TestComponentWithFilteredState.PrerenderState))));
 
         // Act & Assert - Subscribe to normal state should work too
         provider.Subscribe(componentState, normalInfo);
-        Assert.True(provider.Subscriptions.ContainsKey((componentState, nameof(TestComponentWithFilteredState.NormalState))));
+        Assert.True(provider.Subscriptions.ContainsKey(new(componentState, nameof(TestComponentWithFilteredState.NormalState))));
 
         // Verify subscription structure is valid and was created
-        var subscription = provider.Subscriptions[(componentState, nameof(TestComponentWithFilteredState.NormalState))];
+        var subscription = provider.Subscriptions[new(componentState, nameof(TestComponentWithFilteredState.NormalState))];
         // PersistingComponentStateSubscription is a value type, so just verify the subscription exists
-        Assert.True(provider.Subscriptions.ContainsKey((componentState, nameof(TestComponentWithFilteredState.NormalState))));
+        Assert.True(provider.Subscriptions.ContainsKey(new(componentState, nameof(TestComponentWithFilteredState.NormalState))));
     }
 
     [Fact]
@@ -811,11 +811,11 @@ public void Unsubscribe_RemovesSubscriptionCorrectly()
 
         // Act - Subscribe then unsubscribe
         provider.Subscribe(componentState, cascadingParameterInfo);
-        Assert.True(provider.Subscriptions.ContainsKey((componentState, nameof(TestComponentWithFilteredState.PrerenderState))));
+        Assert.True(provider.Subscriptions.ContainsKey(new(componentState, nameof(TestComponentWithFilteredState.PrerenderState))));
 
         provider.Unsubscribe(componentState, cascadingParameterInfo);
 
         // Assert - Subscription should be removed
-        Assert.False(provider.Subscriptions.ContainsKey((componentState, nameof(TestComponentWithFilteredState.PrerenderState))));
+        Assert.False(provider.Subscriptions.ContainsKey(new(componentState, nameof(TestComponentWithFilteredState.PrerenderState))));
     }
 }

src/Components/WebAssembly/WebAssembly/src/Rendering/WebAssemblyRenderer.cs

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices.JavaScript;

src/Components/test/E2ETest/Tests/StatePersistenceTest.cs

@@ -208,7 +208,6 @@ private void ValidateEnhancedNavState(
         Browser.Equal($"Render mode: {renderMode}", () => Browser.FindElement(By.Id("render-mode")).Text);
         Browser.Equal($"Streaming id:{streamingId}", () => Browser.FindElement(By.Id("streaming-id")).Text);
         Browser.Equal($"Interactive: {interactive}", () => Browser.FindElement(By.Id("interactive")).Text);
-        +
         if (streamingId == null || streamingCompleted)
         {
             Browser.Equal($"Enhanced nav state found:{enhancedNavStateFound}", () => Browser.FindElement(By.Id("enhanced-nav-state-found")).Text);