Merge branch 'main' into darc-main-b6753722-f3ed-453f-b86f-4af7542068dc

Author: wtgodbe

.github/copilot-instructions.md

@@ -3,6 +3,8 @@
 * Make only high confidence suggestions when reviewing code changes.
 * Always use the latest version C#, currently C# 13 features.
 * Never change global.json unless explicitly asked to.
+* Never change package.json or package-lock.json files unless explicitly asked to.
+* Never change NuGet.config files unless explicitly asked to.
 
 ## Formatting
 
@@ -12,7 +14,7 @@
 * Ensure that the final return statement of a method is on its own line.
 * Use pattern matching and switch expressions wherever possible.
 * Use `nameof` instead of string literals when referring to member names.
-* Ensure that XML doc comments are created for any public APIs. When applicable, include <example> and <code> documentation in the comments.
+* Ensure that XML doc comments are created for any public APIs. When applicable, include `<example>` and `<code>` documentation in the comments.
 
 ### Nullable Reference Types
 

docs/DailyBuilds.md

@@ -4,7 +4,7 @@ Daily builds include the latest source code changes. They are not supported for
 
 If you want to download the latest daily build and use it in a project, then you need to:
 
-* Obtain the latest [build of the .NET Core SDK](https://github.com/dotnet/sdk/blob/main/documentation/package-table.md).
+* Obtain the latest [build of the .NET Core SDK](https://github.com/dotnet/dotnet/blob/main/docs/builds-table.md).
 * Add a NuGet.Config to your project directory with the following content:
 
 ## .NET 8

eng/Publishing.props

@@ -62,7 +62,7 @@
                       Encoding="ASCII" />
 
     <ItemGroup>
-      <Artifact Include="@(ProductVersionFile)" Kind="Blob" UploadPathSegment="Runtime" />
+      <Artifact Include="@(ProductVersionFile)" Kind="Blob" UploadPathSegment="Runtime/" />
     </ItemGroup>
   </Target>
 

eng/Version.Details.xml

@@ -404,13 +404,13 @@
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>445fb3a55b402cbe3a43576105e6fdc6686c8e4c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.6.0-preview.1.25260.2">
+    <Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.6.0-preview.1.25271.2">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>90dd3fdbb6056d8ae177ab102b779e3922a88981</Sha>
+      <Sha>6f29ab505709370fc9b72bf4bb7e004a7662f69f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.6.0-preview.1.25260.2">
+    <Dependency Name="Microsoft.Extensions.TimeProvider.Testing" Version="9.6.0-preview.1.25271.2">
       <Uri>https://github.com/dotnet/extensions</Uri>
-      <Sha>90dd3fdbb6056d8ae177ab102b779e3922a88981</Sha>
+      <Sha>6f29ab505709370fc9b72bf4bb7e004a7662f69f</Sha>
     </Dependency>
     <Dependency Name="NuGet.Frameworks" Version="6.2.4">
       <Uri>https://github.com/nuget/nuget.client</Uri>

eng/Versions.props

@@ -144,8 +144,8 @@
     <SystemNumericsTensorsVersion>10.0.0-preview.6.25272.109</SystemNumericsTensorsVersion>
     <SystemRuntimeCachingVersion>10.0.0-preview.6.25272.109</SystemRuntimeCachingVersion>
     <!-- Packages from dotnet/extensions -->
-    <MicrosoftExtensionsDiagnosticsTestingVersion>9.6.0-preview.1.25260.2</MicrosoftExtensionsDiagnosticsTestingVersion>
-    <MicrosoftExtensionsTimeProviderTestingVersion>9.6.0-preview.1.25260.2</MicrosoftExtensionsTimeProviderTestingVersion>
+    <MicrosoftExtensionsDiagnosticsTestingVersion>9.6.0-preview.1.25271.2</MicrosoftExtensionsDiagnosticsTestingVersion>
+    <MicrosoftExtensionsTimeProviderTestingVersion>9.6.0-preview.1.25271.2</MicrosoftExtensionsTimeProviderTestingVersion>
     <!-- Packages from dotnet/efcore -->
     <dotnetefVersion>10.0.0-preview.6.25272.109</dotnetefVersion>
     <MicrosoftEntityFrameworkCoreInMemoryVersion>10.0.0-preview.6.25272.109</MicrosoftEntityFrameworkCoreInMemoryVersion>

eng/build.sh

@@ -38,6 +38,7 @@ runtime_source_feed_key=''
 source_build=''
 product_build=''
 from_vmr=''
+warn_as_error=true
 
 if [ "$(uname)" = "Darwin" ]; then
     target_os_name='osx'
@@ -87,6 +88,7 @@ Options:
     --binarylog|-bl                   Use a binary logger
     --excludeCIBinarylog              Don't output binary log by default in CI builds (short: -nobl).
     --verbosity|-v                    MSBuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]
+    --warnAsError                     Sets warnaserror msbuild parameter: 'true' or 'false'
 
     --runtime-source-feed             Additional feed that can be used when downloading .NET runtimes and SDKs
     --runtime-source-feed-key         Key for feed that can be used when downloading .NET runtimes and SDKs
@@ -263,6 +265,10 @@ while [[ $# -gt 0 ]]; do
             ;;
         -fromvmr|-from-vmr)
             from_vmr=true
+        -warnaserror)
+            shift
+            [ -z "${1:-}" ] && __error "Missing value for parameter --warnaserror" && __usage
+            warn_as_error="${1:-}"
             ;;
         *)
             msbuild_args[${#msbuild_args[*]}]="$1"

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

@@ -183,7 +183,8 @@ protected override void AddPendingTask(ComponentState? componentState, Task task
         base.AddPendingTask(componentState, task);
     }
 
-    private void SignalRendererToFinishRendering()
+    // For testing purposes only
+    internal void SignalRendererToFinishRendering()
     {
         // sets a deferred stop on the renderer, which will have an effect after the current batch is completed
         _rendererIsStopped = true;

src/Components/Endpoints/test/EndpointHtmlRendererTest.cs

@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Components.Infrastructure;
 using Microsoft.AspNetCore.Components.Reflection;
 using Microsoft.AspNetCore.Components.Rendering;
+using Microsoft.AspNetCore.Components.RenderTree;
 using Microsoft.AspNetCore.Components.Test.Helpers;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.DataProtection;
@@ -47,18 +48,23 @@ public EndpointHtmlRendererTest()
     }
 
     [Fact]
-    public async Task DoesNotRenderChildAfterRendererStopped()
+    public async Task DoesNotRenderAfterRendererStopped()
     {
-        renderer.SignalRendererToFinishRendering();
-
         var httpContext = GetHttpContext();
         var writer = new StringWriter();
 
-        var result = await renderer.PrerenderComponentAsync(httpContext, typeof(SimpleComponent), null, ParameterView.Empty);
-        await renderer.Dispatcher.InvokeAsync(() => result.WriteTo(writer, HtmlEncoder.Default));
-        var content = writer.ToString();
+        var component = new StoppingRendererComponent();
+        var id = renderer.AssignRootComponentId(component);
+        var initialRenderOperation = renderer.Dispatcher.InvokeAsync(
+            () => renderer.RenderRootComponentAsync(id, ParameterView.Empty));
 
-        Assert.DoesNotContain("Hello from SimpleComponent", content);
+        renderer.SignalRendererToFinishRendering();
+        component.TaskCompletionSource.SetResult(false);
+        await initialRenderOperation;
+        int initialRenderCount = renderer.RenderCount;
+
+        await renderer.Dispatcher.InvokeAsync(() => renderer.RenderRootComponentAsync(id, ParameterView.Empty));
+        Assert.Equal(initialRenderCount, renderer.RenderCount);
     }
 
     [Fact]
@@ -1772,18 +1778,10 @@ private TestEndpointHtmlRenderer GetEndpointHtmlRenderer(IServiceProvider servic
     private class TestEndpointHtmlRenderer : EndpointHtmlRenderer
     {
         private bool _rendererIsStopped = false;
-        public TestEndpointHtmlRenderer(IServiceProvider serviceProvider, ILoggerFactory loggerFactory) : base(serviceProvider, loggerFactory)
-        {
-        }
+        private int _renderCount;
 
-        internal int TestAssignRootComponentId(IComponent component)
+        public TestEndpointHtmlRenderer(IServiceProvider serviceProvider, ILoggerFactory loggerFactory) : base(serviceProvider, loggerFactory)
         {
-            return base.AssignRootComponentId(component);
-        }
-        public void SignalRendererToFinishRendering()
-        {
-            // sets a deferred stop on the renderer, which will have an effect after the current batch is completed
-            _rendererIsStopped = true;
         }
 
         protected override void ProcessPendingRender()
@@ -1793,6 +1791,16 @@ protected override void ProcessPendingRender()
                 return;
             }
             base.ProcessPendingRender();
+
+            _renderCount++;
+        }
+
+        public int RenderCount => _renderCount;
+
+        public new void SignalRendererToFinishRendering()
+        {
+            _rendererIsStopped = true;
+            base.SignalRendererToFinishRendering();
         }
     }
 

src/Components/Endpoints/test/TestComponents/StoppingRendererComponent.razor

@@ -0,0 +1,17 @@
+<h1>Hello from StoppingRendererComponent</h1>
+<p>State is @_state</p>
+
+@code {
+    private bool _state = true;
+
+    // expose a TCS so the test can control when OnInitializedAsync completes
+    public TaskCompletionSource<bool> TaskCompletionSource = new TaskCompletionSource<bool>();
+
+    protected override async Task OnInitializedAsync()
+    {
+        // wait until the test signals
+        var result = await TaskCompletionSource.Task;
+        _state = result;
+        StateHasChanged();
+    }
+}

src/Components/Server/src/Circuits/RemoteNavigationManager.cs

@@ -19,7 +19,7 @@ internal sealed partial class RemoteNavigationManager : NavigationManager, IHost
     private bool? _navigationLockStateBeforeJsRuntimeAttached;
     private const string _enableThrowNavigationException = "Microsoft.AspNetCore.Components.Endpoints.NavigationManager.EnableThrowNavigationException";
 
-    [FeatureSwitchDefinition("Microsoft.AspNetCore.Components.Endpoints.NavigationManager.EnableThrowNavigationException")]
+    [FeatureSwitchDefinition(_enableThrowNavigationException)]
     private static bool _throwNavigationException =>
         AppContext.TryGetSwitch(_enableThrowNavigationException, out var switchValue) && switchValue;
     private Func<string, Task>? _onNavigateTo;