Merge pull request #26307 from dotnet-maestro-bot/merge/release/5.0-rc2-to-master

[automated] Merge branch 'release/5.0-rc2' => 'master'

Author: BrennanConroy

eng/targets/Packaging.targets

@@ -1,7 +1,10 @@
 <Project>
 
   <Target Name="EnsureBaselineIsUpdated"
-          Condition="'$(IsServicingBuild)' == 'true' AND '$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)'"
+          Condition=" '$(IsServicingBuild)' == 'true' AND
+              '$(AspNetCoreBaselineVersion)' != '$(PreviousAspNetCoreReleaseVersion)' AND
+              '$(MSBuildProjectName)' != 'BaselineGenerator' AND
+              '$(MSBuildProjectName)' != 'RepoTasks' "
           BeforeTargets="BeforeBuild">
     <Error Text="The package baseline ($(AspNetCoreBaselineVersion)) is out of date with the latest release of this repo ($(PreviousAspNetCoreReleaseVersion)).
                  See $(RepoRoot)eng\tools\BaselineGenerator\README.md for instructions on updating this baseline." />

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

@@ -667,15 +667,16 @@ public void Clear()
 
         // internal because this should only be used during the post-event tree patching logic
         // It's expensive because it involves copying all the subsequent memory in the array
-        internal void InsertAttributeExpensive(int insertAtIndex, int sequence, string attributeName, object? attributeValue)
+        internal bool InsertAttributeExpensive(int insertAtIndex, int sequence, string attributeName, object? attributeValue)
         {
             // Replicate the same attribute omission logic as used elsewhere
             if ((attributeValue == null) || (attributeValue is bool boolValue && !boolValue))
             {
-                return;
+                return false;
             }
 
             _entries.InsertExpensive(insertAtIndex, RenderTreeFrame.Attribute(sequence, attributeName, attributeValue));
+            return true;
         }
 
         /// <summary>

src/Components/Components/src/Rendering/RenderTreeUpdater.cs

@@ -75,7 +75,14 @@ private static void UpdateFrameToMatchClientState(RenderTreeBuilder renderTreeBu
 
             // If we get here, we didn't find the desired attribute, so we have to insert a new frame for it
             var insertAtIndex = elementFrameIndex + 1;
-            renderTreeBuilder.InsertAttributeExpensive(insertAtIndex, RenderTreeDiffBuilder.SystemAddedAttributeSequenceNumber, attributeName, attributeValue);
+            var didInsertFrame = renderTreeBuilder.InsertAttributeExpensive(insertAtIndex, RenderTreeDiffBuilder.SystemAddedAttributeSequenceNumber, attributeName, attributeValue);
+            if (!didInsertFrame)
+            {
+                // The builder decided to omit the new frame, e.g., because it's a false-valued bool
+                // In this case there's nothing else to update
+                return;
+            }
+
             framesArray = renderTreeBuilder.GetFrames().Array; // Refresh in case it mutated due to the expansion
 
             // Update subtree length for this and all ancestor containers

src/Components/Components/test/RenderTreeUpdaterTest.cs

@@ -127,6 +127,30 @@ public void AddsAttributeIfNotFound()
                 frame => AssertFrame.Attribute(frame, "eventname", v => Assert.IsType<Action>(v), 1));
         }
 
+        [Fact]
+        public void OmitsAttributeIfNotFoundButValueIsOmissible()
+        {
+            // Arrange
+            var valuePropName = "testprop";
+            var renderer = new TestRenderer();
+            var builder = new RenderTreeBuilder();
+            builder.OpenElement(0, "elem");
+            builder.AddAttribute(1, "eventname", (Action)(() => { }));
+            builder.SetUpdatesAttributeName(valuePropName);
+            builder.CloseElement();
+            var frames = builder.GetFrames();
+            frames.Array[1] = frames.Array[1].WithAttributeEventHandlerId(123);
+
+            // Act
+            RenderTreeUpdater.UpdateToMatchClientState(builder, 123, false);
+            frames = builder.GetFrames();
+
+            // Assert
+            Assert.Collection(frames.AsEnumerable(),
+                frame => AssertFrame.Element(frame, "elem", 2, 0),
+                frame => AssertFrame.Attribute(frame, "eventname", v => Assert.IsType<Action>(v), 1));
+        }
+
         [Fact]
         public void ExpandsAllAncestorsWhenAddingAttribute()
         {

src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestResponseTests.cs

@@ -136,6 +136,7 @@ public async Task PassesThroughCompressionInProcess()
         }
 
         [ConditionalFact]
+        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/26294")]
         public async Task ReadAndWriteSynchronously()
         {
             var content = new StringContent(new string('a', 100000));

src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs

@@ -1503,6 +1503,7 @@ public Task Frame_MultipleStreams_RequestsNotFinished_LowMaxStreamsPerConnection
         }
 
         [Fact]
+        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/26291")]
         public Task Frame_MultipleStreams_RequestsNotFinished_DefaultMaxStreamsPerConnection_EnhanceYourCalmAfterDoubleMaxStreams()
         {
             // Kestrel tracks max streams per connection * 2