Merge pull request #51589 from dotnet-maestro-bot/merge/release/8.0-to-main

[automated] Merge branch 'release/8.0' => 'main'

Author: wtgodbe

THIRD-PARTY-NOTICES.txt

@@ -339,20 +339,20 @@
       <SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
     </Dependency>
     <!-- Not updated automatically -->
-    <Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.7.0-3.23314.3">
+    <Dependency Name="Microsoft.CodeAnalysis.Common" Version="4.8.0-3.23518.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>1aa759af23d2a29043ea44fcef5bd6823dafa5d0</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" Version="4.7.0-3.23314.3">
+    <Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore" Version="4.8.0-3.23518.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>1aa759af23d2a29043ea44fcef5bd6823dafa5d0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.7.0-3.23314.3">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.8.0-3.23518.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>1aa759af23d2a29043ea44fcef5bd6823dafa5d0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.7.0-3.23314.3">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.8.0-3.23518.7">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>1aa759af23d2a29043ea44fcef5bd6823dafa5d0</Sha>
     </Dependency>

eng/Version.Details.xml

@@ -150,10 +150,10 @@
     <MicrosoftEntityFrameworkCoreVersion>9.0.0-alpha.1.23524.8</MicrosoftEntityFrameworkCoreVersion>
     <MicrosoftEntityFrameworkCoreDesignVersion>9.0.0-alpha.1.23524.8</MicrosoftEntityFrameworkCoreDesignVersion>
     <!-- Packages from dotnet/roslyn -->
-    <MicrosoftCodeAnalysisCommonVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisCommonVersion>
-    <MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
-    <MicrosoftCodeAnalysisCSharpVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisCSharpVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
+    <MicrosoftCodeAnalysisCommonVersion>4.8.0-3.23518.7</MicrosoftCodeAnalysisCommonVersion>
+    <MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.8.0-3.23518.7</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
+    <MicrosoftCodeAnalysisCSharpVersion>4.8.0-3.23518.7</MicrosoftCodeAnalysisCSharpVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.8.0-3.23518.7</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
     <!-- Packages from NuGet/Nuget.client -->
     <!-- If you update these versions, make sure to also update https://github.com/dotnet/aspnetcore/blob/main/eng/SourceBuildPrebuiltBaseline.xml -->
     <NuGetPackagingVersion>6.2.4</NuGetPackagingVersion>
@@ -247,11 +247,11 @@
     <Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion>3.3.1</Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion>
     <!-- Pin the version of the M.CA dependencies that we utilize with a cutom version property $(MicrosoftCodeAnalysisVersion_LatestVS) to avoid automatically
     consuming the newest version of the packages when using the $(MicrosoftCodeAnalysisCSharpVersion) properties in source-build. -->
-    <MicrosoftCodeAnalysisVersion_LatestVS>4.7.0-3.23314.3</MicrosoftCodeAnalysisVersion_LatestVS>
-    <MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
-    <MicrosoftCodeAnalysisCommonVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisCommonVersion>
-    <MicrosoftCodeAnalysisCSharpVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisCSharpVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.7.0-3.23314.3</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
+    <MicrosoftCodeAnalysisVersion_LatestVS>4.8.0-3.23518.7</MicrosoftCodeAnalysisVersion_LatestVS>
+    <MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.8.0-3.23518.7</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
+    <MicrosoftCodeAnalysisCommonVersion>4.8.0-3.23518.7</MicrosoftCodeAnalysisCommonVersion>
+    <MicrosoftCodeAnalysisCSharpVersion>4.8.0-3.23518.7</MicrosoftCodeAnalysisCSharpVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesVersion>4.8.0-3.23518.7</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
     <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
     <MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>1.1.2-beta1.23371.1</MicrosoftCodeAnalysisCSharpAnalyzerTestingXUnitVersion>
     <MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>1.1.2-beta1.23371.1</MicrosoftCodeAnalysisCSharpCodeFixTestingXUnitVersion>

eng/Versions.props

@@ -26,10 +26,9 @@ Microsoft.AspNetCore.Components.RenderHandle.DispatchExceptionAsync(System.Excep
 *REMOVED*Microsoft.AspNetCore.Components.NavigationManager.ToAbsoluteUri(string! relativeUri) -> System.Uri!
 Microsoft.AspNetCore.Components.NavigationManager.ToAbsoluteUri(string? relativeUri) -> System.Uri!
 Microsoft.AspNetCore.Components.Rendering.ComponentState.LogicalParentComponentState.get -> Microsoft.AspNetCore.Components.Rendering.ComponentState?
-Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder.AddComponentParameter(int sequence, string! name, Microsoft.AspNetCore.Components.IComponentRenderMode! renderMode) -> void
 *REMOVED*Microsoft.AspNetCore.Components.RouteData.RouteData(System.Type! pageType, System.Collections.Generic.IReadOnlyDictionary<string!, object!>! routeValues) -> void
 *REMOVED*Microsoft.AspNetCore.Components.RouteData.RouteValues.get -> System.Collections.Generic.IReadOnlyDictionary<string!, object!>!
-Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder.AddComponentRenderMode(Microsoft.AspNetCore.Components.IComponentRenderMode! renderMode) -> void
+Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder.AddComponentRenderMode(Microsoft.AspNetCore.Components.IComponentRenderMode? renderMode) -> void
 Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder.AddNamedEvent(string! eventType, string! assignedName) -> void
 Microsoft.AspNetCore.Components.RenderTree.ComponentFrameFlags
 Microsoft.AspNetCore.Components.RenderTree.ComponentFrameFlags.HasCallerSpecifiedRenderMode = 1 -> Microsoft.AspNetCore.Components.RenderTree.ComponentFrameFlags

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

@@ -27,8 +27,6 @@ public sealed class RenderTreeBuilder : IDisposable
     private RenderTreeFrameType? _lastNonAttributeFrameType;
     private bool _hasSeenAddMultipleAttributes;
     private Dictionary<string, int>? _seenAttributeNames;
-    private IComponentRenderMode? _pendingComponentCallSiteRenderMode; // TODO: Remove when Razor compiler supports call-site @rendermode
-    private string? _pendingNamedSubmitEvent; // TODO: Remove when Razor compiler supports @formname
 
     /// <summary>
     /// The reserved parameter name used for supplying child content.
@@ -45,8 +43,6 @@ public sealed class RenderTreeBuilder : IDisposable
     /// <param name="elementName">A value representing the type of the element.</param>
     public void OpenElement(int sequence, string elementName)
     {
-        CompletePendingNamedSubmitEvent();
-
         // We are entering a new scope, since we track the "duplicate attributes" per
         // element/component we might need to clean them up now.
         if (_hasSeenAddMultipleAttributes)
@@ -66,8 +62,6 @@ public void OpenElement(int sequence, string elementName)
     /// </summary>
     public void CloseElement()
     {
-        CompletePendingNamedSubmitEvent();
-
         var indexOfEntryBeingClosed = _openElementIndices.Pop();
 
         // We might be closing an element with only attributes, run the duplicate cleanup pass
@@ -80,16 +74,6 @@ public void CloseElement()
         _entries.Buffer[indexOfEntryBeingClosed].ElementSubtreeLengthField = _entries.Count - indexOfEntryBeingClosed;
     }
 
-    // TODO: Remove this once Razor supports @formname
-    private void CompletePendingNamedSubmitEvent()
-    {
-        if (_pendingNamedSubmitEvent is not null)
-        {
-            AddNamedEvent("onsubmit", _pendingNamedSubmitEvent);
-            _pendingNamedSubmitEvent = default;
-        }
-    }
-
     /// <summary>
     /// Appends a frame representing markup content.
     /// </summary>
@@ -237,16 +221,7 @@ public void AddAttribute(int sequence, string name, string? value)
         AssertCanAddAttribute();
         if (value != null || _lastNonAttributeFrameType == RenderTreeFrameType.Component)
         {
-            // TODO: Remove this once the Razor compiler is updated to support @formname
-            // That should compile directly as a call to AddNamedEvent.
-            if (string.Equals(name, "@formname", StringComparison.Ordinal) && _lastNonAttributeFrameType == RenderTreeFrameType.Element)
-            {
-                _pendingNamedSubmitEvent = value!;
-            }
-            else
-            {
-                _entries.AppendAttribute(sequence, name, value);
-            }
+            _entries.AppendAttribute(sequence, name, value);
         }
         else
         {
@@ -530,28 +505,6 @@ public void OpenComponent(int sequence, [DynamicallyAccessedMembers(Component)]
         OpenComponentUnchecked(sequence, componentType);
     }
 
-    /// <summary>
-    /// Temporary API until Razor compiler is updated. This will be removed before .NET 8 ships.
-    /// </summary>
-    public void AddComponentParameter(int sequence, string name, IComponentRenderMode renderMode)
-    {
-        if (string.Equals(name, "@rendermode", StringComparison.Ordinal))
-        {
-            // When the Razor compiler is updated, <SomeComponent @rendermode="@RenderMode.WebAssembly" />  would compile directly as a call
-            // to AddComponentRenderMode(RenderMode.WebAssembly), which must appear after all attributes. Until then we'll intercept regular
-            // parameters with this name and IComponentRenderMode values. Unfortunately we can't guarantee that the parameter will appear after
-            // all other parameters (e.g., ChildContent would always go later), so use this inefficient trick to defer adding it.
-            // It won't be needed once the Razor compiler supports @rendermode.
-            _pendingComponentCallSiteRenderMode = renderMode;
-        }
-        else
-        {
-            // For other parameter names, the developer is doing something custom so just pass the parameter as normal
-            // This special case will also not be relevant once we have @rendermode
-            AddComponentParameter(sequence, name, (object)renderMode);
-        }
-    }
-
     /// <summary>
     /// Appends a frame representing a component parameter.
     /// </summary>
@@ -600,8 +553,6 @@ public void SetKey(object? value)
 
     private void OpenComponentUnchecked(int sequence, [DynamicallyAccessedMembers(Component)] Type componentType)
     {
-        CompletePendingNamedSubmitEvent();
-
         // We are entering a new scope, since we track the "duplicate attributes" per
         // element/component we might need to clean them up now.
         if (_hasSeenAddMultipleAttributes)
@@ -621,12 +572,6 @@ private void OpenComponentUnchecked(int sequence, [DynamicallyAccessedMembers(Co
     /// </summary>
     public void CloseComponent()
     {
-        if (_pendingComponentCallSiteRenderMode is not null)
-        {
-            AddComponentRenderMode(_pendingComponentCallSiteRenderMode);
-            _pendingComponentCallSiteRenderMode = null;
-        }
-
         var indexOfEntryBeingClosed = _openElementIndices.Pop();
 
         // We might be closing a component with only attributes. Run the attribute cleanup pass
@@ -682,9 +627,12 @@ public void AddComponentReferenceCapture(int sequence, Action<object> componentR
     /// Adds a frame indicating the render mode on the enclosing component frame.
     /// </summary>
     /// <param name="renderMode">The <see cref="IComponentRenderMode"/>.</param>
-    public void AddComponentRenderMode(IComponentRenderMode renderMode)
+    public void AddComponentRenderMode(IComponentRenderMode? renderMode)
     {
-        ArgumentNullException.ThrowIfNull(renderMode);
+        if (renderMode is null)
+        {
+            return;
+        }
 
         // Note that a ComponentRenderMode frame is technically a child of the Component frame to which it applies,
         // hence the terminology of "adding" it rather than "setting" it. For performance reasons, the diffing system

src/Components/Components/src/Rendering/RenderTreeBuilder.cs

@@ -2141,18 +2141,26 @@ public void CannotAddComponentRenderModeToElement()
     }
 
     [Fact]
-    public void CannotAddNullComponentRenderMode()
+    public void CanAddNullComponentRenderMode()
     {
         // Arrange
         var builder = new RenderTreeBuilder();
+
+        // Act
         builder.OpenComponent<TestComponent>(0);
+        builder.AddComponentParameter(1, "param", 123);
+        builder.AddComponentRenderMode(null);
+        builder.CloseComponent();
 
-        // Act/Assert
-        var ex = Assert.Throws<ArgumentNullException>(() =>
-        {
-            builder.AddComponentRenderMode(null);
-        });
-        Assert.Equal("renderMode", ex.ParamName);
+        // Assert
+        Assert.Collection(
+            builder.GetFrames().AsEnumerable(),
+            frame =>
+            {
+                AssertFrame.Component<TestComponent>(frame, 2, 0);
+                Assert.False(frame.ComponentFrameFlags.HasFlag(ComponentFrameFlags.HasCallerSpecifiedRenderMode));
+            },
+            frame => AssertFrame.Attribute(frame, "param", 123, 1));
     }
 
     [Fact]
@@ -2171,39 +2179,6 @@ public void CannotAddParametersAfterComponentRenderMode()
         Assert.Equal($"Component parameters may only be added immediately after frames of type {RenderTreeFrameType.Component}", ex.Message);
     }
 
-    [Fact]
-    public void TemporaryApiForCallSiteComponentRenderModeWorksEvenIfOtherParameterAddedAfter()
-    {
-        // For the temporary syntax rendermode=@something (as opposed to @rendermode=@something), we can't guarantee
-        // the Razor compiler will emit the AddComponentParameter call for rendermode last. For example if there's a
-        // ChildContent it will actually emit that last. So for the temporary syntax to be usable it has to support
-        // other component parameters being added afterwards, even though that does not need to be supported for
-        // AddComponentRenderMode (since the compiler can be sure to add that after all component parameters).
-
-        // Arrange
-        var builder = new RenderTreeBuilder();
-        var renderMode = new TestRenderMode();
-
-        // Act
-        builder.OpenComponent<TestComponent>(0);
-        builder.AddComponentParameter(1, "param", 123);
-        builder.AddComponentParameter(2, "@rendermode", renderMode);
-        builder.AddComponentParameter(3, "anotherparam", 456);
-        builder.CloseComponent();
-
-        // Assert
-        Assert.Collection(
-            builder.GetFrames().AsEnumerable(),
-            frame =>
-            {
-                AssertFrame.Component<TestComponent>(frame, 4, 0);
-                Assert.True(frame.ComponentFrameFlags.HasFlag(ComponentFrameFlags.HasCallerSpecifiedRenderMode));
-            },
-            frame => AssertFrame.Attribute(frame, "param", 123, 1),
-            frame => AssertFrame.Attribute(frame, "anotherparam", 456, 3),
-            frame => AssertFrame.ComponentRenderMode(frame, renderMode));
-    }
-
     [Fact]
     public void CanAddNamedEvent()
     {
@@ -2301,34 +2276,6 @@ public void CannotAddAttributesAfterNamedEvent()
         Assert.Equal($"Attributes may only be added immediately after frames of type {RenderTreeFrameType.Element} or {RenderTreeFrameType.Component}", ex.Message);
     }
 
-    [Fact]
-    public void TemporaryApiForFormNameEventsWorksEvenIfAttributesAddedAfter()
-    {
-        // TODO: Remove this once the Razor compiler is updated to support @formname directly
-
-        // Arrange
-        var builder = new RenderTreeBuilder();
-        var renderMode = new TestRenderMode();
-
-        // Act
-        builder.OpenElement(0, "div");
-        builder.AddAttribute(1, "attr1", 123);
-        builder.AddAttribute(2, "@formname", "some custom name");
-        builder.AddAttribute(3, "attr2", 456);
-        builder.OpenElement(4, "other");
-        builder.CloseElement();
-        builder.CloseElement();
-
-        // Assert
-        Assert.Collection(
-            builder.GetFrames().AsEnumerable(),
-            frame => AssertFrame.Element(frame, "div", 5, 0),
-            frame => AssertFrame.Attribute(frame, "attr1", "123", 1),
-            frame => AssertFrame.Attribute(frame, "attr2", "456", 3),
-            frame => AssertFrame.NamedEvent(frame, "onsubmit", "some custom name"),
-            frame => AssertFrame.Element(frame, "other", 1));
-    }
-
     private class TestComponent : IComponent
     {
         public void Attach(RenderHandle renderHandle) { }

src/Components/Components/test/Rendering/RenderTreeBuilderTest.cs

@@ -9,6 +9,7 @@
       "src\\Components\\Components\\perf\\Microsoft.AspNetCore.Components.Performance.csproj",
       "src\\Components\\Components\\src\\Microsoft.AspNetCore.Components.csproj",
       "src\\Components\\Components\\test\\Microsoft.AspNetCore.Components.Tests.csproj",
+      "src\\Components\\CustomElements\\src\\Microsoft.AspNetCore.Components.CustomElements.csproj",
       "src\\Components\\Endpoints\\src\\Microsoft.AspNetCore.Components.Endpoints.csproj",
       "src\\Components\\Endpoints\\test\\Microsoft.AspNetCore.Components.Endpoints.Tests.csproj",
       "src\\Components\\Forms\\src\\Microsoft.AspNetCore.Components.Forms.csproj",