Merge branch 'master' into merge/release/3.0-preview5-to-master

Author: dougbu

.azure/pipelines/signalr-daily-tests.yml

@@ -14,4 +14,7 @@ jobs:
     agentOs: Windows
     jobName: SignalRDailyTests
     jobDisplayName: "SignalR Daily Tests"
-
+    artifacts:
+    - name: Windows_Logs
+      path: ../../artifacts/logs/
+      publishOnError: true

eng/Version.Details.xml

@@ -143,7 +143,7 @@ try {
     if ($changedFiles) {
         foreach ($file in $changedFiles) {
             $filePath = Resolve-Path "${repoRoot}/${file}"
-            LogError "Generated code is not up to date in $file." -filepath $filePath
+            LogError "Generated code is not up to date in $file. You might need to regenerate the reference assemblies or project list (see docs/ReferenceAssemblies.md and docs/ReferenceResolution.md)" -filepath $filePath
             & git --no-pager diff --ignore-space-at-eol $filePath
         }
     }

eng/Versions.props

@@ -350,7 +350,7 @@ public class MyComponent : ComponentBase
             // Assert: Captured ChildContent frames are correct
             var childFrames = GetFrames((RenderFragment)frames[2].AttributeValue);
             Assert.Collection(
-                childFrames,
+                childFrames.AsEnumerable(),
                 frame => AssertFrame.Text(frame, "Some text", 3),
                 frame => AssertFrame.Element(frame, "some-child", 4, 4),
                 frame => AssertFrame.Attribute(frame, "a", "1", 5),
@@ -393,15 +393,15 @@ public class MyComponent : ComponentBase
             // correct relative to each other (i.e., incrementing) within the nesting level.
             // As an implementation detail, it happens that they do follow on from the parent
             // level, but we could change that part of the implementation if we wanted.
-            var innerFrames = GetFrames((RenderFragment)frames[1].AttributeValue).ToArray();
+            var innerFrames = GetFrames((RenderFragment)frames[1].AttributeValue).AsEnumerable().ToArray();
             Assert.Collection(
                 innerFrames,
                 frame => AssertFrame.Component(frame, "Test.MyComponent", 2, 2),
                 frame => AssertFrame.Attribute(frame, RenderTreeBuilder.ChildContent, 3));
 
             // Assert: second level of ChildContent is correct
             Assert.Collection(
-                GetFrames((RenderFragment)innerFrames[1].AttributeValue),
+                GetFrames((RenderFragment)innerFrames[1].AttributeValue).AsEnumerable(),
                 frame => AssertFrame.Text(frame, "Some text", 4));
         }
 
@@ -547,7 +547,7 @@ public class MyComponent : ComponentBase
             // Assert: Captured ChildContent frames are correct
             var childFrames = GetFrames((RenderFragment)frames[6].AttributeValue);
             Assert.Collection(
-                childFrames,
+                childFrames.AsEnumerable(),
                 frame => AssertFrame.MarkupWhitespace(frame, 7),
                 frame => AssertFrame.Markup(frame, "<div><span></span><span></span></div>\n      ", 8),
                 frame => AssertFrame.Element(frame, "div", 2, 9),

eng/scripts/CodeCheck.ps1

@@ -457,7 +457,7 @@ protected override void HandleException(Exception exception)
 
             protected override Task UpdateDisplayAsync(in RenderBatch renderBatch)
             {
-                LatestBatchReferenceFrames = renderBatch.ReferenceFrames.ToArray();
+                LatestBatchReferenceFrames = renderBatch.ReferenceFrames.AsEnumerable().ToArray();
                 return Task.CompletedTask;
             }
         }

src/Components/Blazor/Build/test/ComponentRenderingRazorIntegrationTest.cs

@@ -244,22 +244,6 @@ public void SupportsAttributesWithInterpolatedStringExpressionValues()
                 frame => AssertFrame.Attribute(frame, "attr", "Hello, WORLD    with number 246!", 1));
         }
 
-        // This test exercises the case where two IntermediateTokens are part of the same expression.
-        // In these case they are split by a comment.
-        [Fact]
-        public void SupportsAttributesWithInterpolatedStringExpressionValues_SplitByComment()
-        {
-            // Arrange/Act
-            var component = CompileToComponent(
-                "@{ var myValue = \"world\"; var myNum=123; }"
-                + "<elem attr=\"Hello, @myValue.ToUpperInvariant()    with number @(myN@* Blazor is Blawesome! *@um*2)!\" />");
-
-            // Assert
-            Assert.Collection(GetRenderTree(component),
-                frame => AssertFrame.Element(frame, "elem", 2, 0),
-                frame => AssertFrame.Attribute(frame, "attr", "Hello, WORLD    with number 246!", 1));
-        }
-
         [Fact]
         public void SupportsAttributesWithInterpolatedTernaryExpressionValues()
         {

src/Components/Blazor/Build/test/RazorIntegrationTestBase.cs

@@ -726,14 +726,12 @@ protected virtual void Dispose(bool disposing) { }
 namespace Microsoft.AspNetCore.Components.RenderTree
 {
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
-    public readonly partial struct ArrayRange<T> : System.Collections.Generic.IEnumerable<T>, System.Collections.IEnumerable
+    public readonly partial struct ArrayRange<T>
     {
         public readonly T[] Array;
         public readonly int Count;
         public ArrayRange(T[] array, int count) { throw null; }
         public Microsoft.AspNetCore.Components.RenderTree.ArrayRange<T> Clone() { throw null; }
-        System.Collections.Generic.IEnumerator<T> System.Collections.Generic.IEnumerable<T>.GetEnumerator() { throw null; }
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator() { throw null; }
     }
     public partial class RenderTreeBuilder
     {

src/Components/Blazor/Build/test/RenderingRazorIntegrationTest.cs

@@ -1,17 +1,13 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
 namespace Microsoft.AspNetCore.Components.RenderTree
 {
     /// <summary>
     /// Represents a range of elements in an array that are in use.
     /// </summary>
     /// <typeparam name="T">The array item type.</typeparam>
-    public readonly struct ArrayRange<T> : IEnumerable, IEnumerable<T>
+    public readonly struct ArrayRange<T>
     {
         /// <summary>
         /// Gets the underlying array instance.
@@ -34,14 +30,6 @@ public ArrayRange(T[] array, int count)
             Count = count;
         }
 
-        /// <inheritdoc />
-        IEnumerator<T> IEnumerable<T>.GetEnumerator()
-            => ((IEnumerable<T>)new ArraySegment<T>(Array, 0, Count)).GetEnumerator();
-
-        /// <inheritdoc />
-        IEnumerator IEnumerable.GetEnumerator()
-            => ((IEnumerable)new ArraySegment<T>(Array, 0, Count)).GetEnumerator();
-
         /// <summary>
         /// Creates a shallow clone of the instance.
         /// </summary>