merge master into branch

Author: wtgodbe

.github/labeler.yml

@@ -0,0 +1,53 @@
+#area-azure:
+
+area-blazor:
+  - src/Components/**/*
+
+#area-commandlinetools:
+
+area-dataprotection:
+  - src/DataProtection/**/*
+
+#area-grpc:
+
+#area-healthchecks:
+
+area-hosting:
+  - src/Hosting/**/*
+  - src/SiteExtensions/**/*
+
+#area-httpclientfactory:
+
+area-identity:
+  - src/Identity/**/*
+
+area-infrastructure:
+  - global.json
+  - .azure/**/*
+  - .config/**/*
+  - eng/**/*
+
+area-installers:
+  - src/Installers/**/*
+
+area-middleware:
+  - src/Middleware/**/*
+
+area-mvc:
+  - src/ProjectTemplates/**/*
+  - src/Razor/**/*
+  - src/Mvc/**/*
+  - src/MusicStore/**/*
+  
+#area-platform:
+
+area-security:
+  - src/Security/**/*
+
+area-servers:
+  - src/Servers/**/*
+
+area-signalr:
+  - src/SignalR/**/*
+
+#area-websockets:

.github/workflows/labeler.yml

@@ -0,0 +1,11 @@
+name: "Pull Request Labeler"
+on:
+- pull_request
+
+jobs:
+  triage:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/labeler@v2
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

docs/ReferenceAssemblies.md

@@ -22,4 +22,4 @@ Set `<HasReferenceAssembly>false</HasReferenceAssembly>` in the implementation (
 
 ### Regenerate reference assemblies for all projects
 
-Run `.\eng\scripts\GenerateReferenceAssemblies.ps1` from repository root.
+Run `.\eng\scripts\GenerateReferenceAssemblies.ps1` from repository root. Make sure you've run `.\restore.cmd` first.

eng/Version.Details.xml

@@ -279,11 +279,27 @@ public Uri Referer
             }
         }
 
+        /// <summary>
+        /// Gets the value of header with <paramref name="name"/>.
+        /// </summary>
+        /// <remarks><typeparamref name="T"/> must contain a TryParse method with the signature <code>public static bool TryParse(string, out T)</code>.</remarks>
+        /// <typeparam name="T">The type of the header.
+        /// The given type must have a static TryParse method.</typeparam>
+        /// <param name="name">The name of the header to retrieve.</param>
+        /// <returns>The value of the header.</returns>
         public T Get<T>(string name)
         {
             return Headers.Get<T>(name);
         }
 
+        /// <summary>
+        /// Gets the values of header with <paramref name="name"/>.
+        /// </summary>
+        /// <remarks><typeparamref name="T"/> must contain a TryParseList method with the signature <code>public static bool TryParseList(IList&lt;string&gt;, out IList&lt;T&gt;)</code>.</remarks>
+        /// <typeparam name="T">The type of the header.
+        /// The given type must have a static TryParseList method.</typeparam>
+        /// <param name="name">The name of the header to retrieve.</param>
+        /// <returns>List of values of the header.</returns>
         public IList<T> GetList<T>(string name)
         {
             return Headers.GetList<T>(name);

eng/Versions.props

@@ -158,11 +158,27 @@ public IList<SetCookieHeaderValue> SetCookie
             }
         }
 
+        /// <summary>
+        /// Gets the value of header with <paramref name="name"/>.
+        /// </summary>
+        /// <remarks><typeparamref name="T"/> must contain a TryParse method with the signature <code>public static bool TryParse(string, out T)</code>.</remarks>
+        /// <typeparam name="T">The type of the header.
+        /// The given type must have a static TryParse method.</typeparam>
+        /// <param name="name">The name of the header to retrieve.</param>
+        /// <returns>The value of the header.</returns>
         public T Get<T>(string name)
         {
             return Headers.Get<T>(name);
         }
 
+        /// <summary>
+        /// Gets the values of header with <paramref name="name"/>.
+        /// </summary>
+        /// <remarks><typeparamref name="T"/> must contain a TryParseList method with the signature <code>public static bool TryParseList(IList&lt;string&gt;, out IList&lt;T&gt;)</code>.</remarks>
+        /// <typeparam name="T">The type of the header.
+        /// The given type must have a static TryParseList method.</typeparam>
+        /// <param name="name">The name of the header to retrieve.</param>
+        /// <returns>List of values of the header.</returns>
         public IList<T> GetList<T>(string name)
         {
             return Headers.GetList<T>(name);
@@ -208,4 +224,4 @@ public void AppendList<T>(string name, IList<T> values)
             Headers.AppendList<T>(name, values);
         }
     }
-}
+}

src/Http/Http.Extensions/src/RequestHeaders.cs

@@ -481,7 +481,7 @@ internal static bool HasNullableAttribute(IEnumerable<object> attributes, out bo
             // See: https://github.com/dotnet/roslyn/blob/master/docs/features/nullable-reference-types.md#annotations
             if (nullableAttribute.GetType().GetField(NullableFlagsFieldName) is FieldInfo field &&
                 field.GetValue(nullableAttribute) is byte[] flags &&
-                flags.Length >= 0 &&
+                flags.Length > 0 &&
                 flags[0] == 1) // First element is the property/parameter type.
             {
                 isNullable = true;

src/Http/Http.Extensions/src/ResponseHeaders.cs

@@ -52,7 +52,7 @@ public async Task<IEnumerable<string>> PrerenderComponentAsync(
                         // all components have rendered.
                         throw new InvalidOperationException("A navigation command was attempted during prerendering after the server already started sending the response. " +
                             "Navigation commands can not be issued during server-side prerendering after the response from the server has started. Applications must buffer the" +
-                            "reponse and avoid using features like FlushAsync() before all components on the page have been rendered to prevent failed navigation commands.", navigationException);
+                            "response and avoid using features like FlushAsync() before all components on the page have been rendered to prevent failed navigation commands.", navigationException);
                     }
 
                     httpContext.Response.Redirect(navigationException.Location);

src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsMetadataProvider.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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;
@@ -473,8 +473,8 @@ public async Task UriHelperRedirect_ThrowsInvalidOperationException_WhenResponse
                 }));
 
             Assert.Equal("A navigation command was attempted during prerendering after the server already started sending the response. " +
-                "Navigation commands can not be issued during server-side prerendering after the response from the server has started. Applications must buffer the" +
-                "reponse and avoid using features like FlushAsync() before all components on the page have been rendered to prevent failed navigation commands.",
+                            "Navigation commands can not be issued during server-side prerendering after the response from the server has started. Applications must buffer the" +
+                            "response and avoid using features like FlushAsync() before all components on the page have been rendered to prevent failed navigation commands.",
                 exception.Message);
         }
 

src/Mvc/Mvc.ViewFeatures/src/RazorComponents/StaticComponentRenderer.cs

@@ -312,6 +312,50 @@ public void ReadCaseInsensitivePropertiesByDefault()
             }, streamItemMessage.Item);
         }
 
+        public static IDictionary<string, MessageSizeTestData> MessageSizeData => new[]
+        {
+            new MessageSizeTestData("InvocationMessage_WithoutInvocationId", new InvocationMessage("Target", new object[] { 1 }), 45),
+            new MessageSizeTestData("InvocationMessage_WithInvocationId", new InvocationMessage("1", "Target", new object[] { 1 }), 64),
+            new MessageSizeTestData("InvocationMessage_WithInvocationIdAndStreamId", new InvocationMessage("1", "Target", new object[] { 1 }, new string[] { "2" }), 82),
+
+            new MessageSizeTestData("CloseMessage_Empty", CloseMessage.Empty, 11),
+            new MessageSizeTestData("CloseMessage_WithError", new CloseMessage("error"), 27),
+
+            new MessageSizeTestData("StreamItemMessage_WithNullItem", new StreamItemMessage("1", null), 42),
+            new MessageSizeTestData("StreamItemMessage_WithItem", new StreamItemMessage("1", 1), 39),
+
+            new MessageSizeTestData("CompletionMessage_Empty", CompletionMessage.Empty("1"), 30),
+            new MessageSizeTestData("CompletionMessage_WithResult", CompletionMessage.WithResult("1", 1), 41),
+            new MessageSizeTestData("CompletionMessage_WithError", CompletionMessage.WithError("1", "error"), 46),
+
+            new MessageSizeTestData("StreamInvocationMessage", new StreamInvocationMessage("1", "target", Array.Empty<object>()), 63),
+            new MessageSizeTestData("StreamInvocationMessage_WithStreamId", new StreamInvocationMessage("1", "target", Array.Empty<object>(), new [] { "2" }), 81),
+
+            new MessageSizeTestData("CancelInvocationMessage", new CancelInvocationMessage("1"), 30),
+
+            new MessageSizeTestData("PingMessage", PingMessage.Instance, 11),
+        }.ToDictionary(t => t.Name);
+
+        public static IEnumerable<object[]> MessageSizeDataNames => MessageSizeData.Keys.Select(name => new object[] { name });
+
+        [Theory]
+        [MemberData(nameof(MessageSizeDataNames))]
+        public void VerifyMessageSize(string testDataName)
+        {
+            var testData = MessageSizeData[testDataName];
+
+            var writer = MemoryBufferWriter.Get();
+            try
+            {
+                JsonHubProtocol.WriteMessage(testData.Message, writer);
+                Assert.Equal(testData.Size, writer.Length);
+            }
+            finally
+            {
+                MemoryBufferWriter.Return(writer);
+            }
+        }
+
         public static string Frame(string input)
         {
             var data = Encoding.UTF8.GetBytes(input);
@@ -345,5 +389,21 @@ public JsonProtocolTestData(string name, HubMessage message, bool useCamelCase,
 
             public override string ToString() => Name;
         }
+
+        public class MessageSizeTestData
+        {
+            public string Name { get; }
+            public HubMessage Message { get; }
+            public int Size { get; }
+
+            public MessageSizeTestData(string name, HubMessage message, int size)
+            {
+                Name = name;
+                Message = message;
+                Size = size;
+            }
+
+            public override string ToString() => Name;
+        }
     }
 }

src/Mvc/Mvc.ViewFeatures/test/RazorComponents/ComponentRendererTest.cs

@@ -195,5 +195,55 @@ public void WriteMessages(string testDataName)
 
             TestWriteMessages(testData);
         }
+
+        public static IDictionary<string, MessageSizeTestData> MessageSizeData => new[]
+        {
+            new MessageSizeTestData("InvocationMessage_WithoutInvocationId", new InvocationMessage("Target", new object[] { 1 }), 15),
+            new MessageSizeTestData("InvocationMessage_WithInvocationId", new InvocationMessage("1", "Target", new object[] { 1 }), 16),
+            new MessageSizeTestData("InvocationMessage_WithInvocationIdAndStreamId", new InvocationMessage("1", "Target", new object[] { 1 }, new string[] { "2" }), 18),
+
+            new MessageSizeTestData("CloseMessage_Empty", CloseMessage.Empty, 4),
+            new MessageSizeTestData("CloseMessage_WithError", new CloseMessage("error"), 9),
+
+            new MessageSizeTestData("StreamItemMessage_WithNullItem", new StreamItemMessage("1", null), 7),
+            new MessageSizeTestData("StreamItemMessage_WithItem", new StreamItemMessage("1", 1), 7),
+
+            new MessageSizeTestData("CompletionMessage_Empty", CompletionMessage.Empty("1"), 7),
+            new MessageSizeTestData("CompletionMessage_WithResult", CompletionMessage.WithResult("1", 1), 8),
+            new MessageSizeTestData("CompletionMessage_WithError", CompletionMessage.WithError("1", "error"), 13),
+
+            new MessageSizeTestData("StreamInvocationMessage", new StreamInvocationMessage("1", "target", Array.Empty<object>()), 15),
+            new MessageSizeTestData("StreamInvocationMessage_WithStreamId", new StreamInvocationMessage("1", "target", Array.Empty<object>(), new [] { "2" }), 17),
+
+            new MessageSizeTestData("CancelInvocationMessage", new CancelInvocationMessage("1"), 6),
+
+            new MessageSizeTestData("PingMessage", PingMessage.Instance, 3),
+        }.ToDictionary(t => t.Name);
+
+        public static IEnumerable<object[]> MessageSizeDataNames => MessageSizeData.Keys.Select(name => new object[] { name });
+
+        [Theory]
+        [MemberData(nameof(MessageSizeDataNames))]
+        public void VerifyMessageSize(string testDataName)
+        {
+            var testData = MessageSizeData[testDataName];
+            Assert.Equal(testData.Size, Write(testData.Message).Length);
+        }
+
+        public class MessageSizeTestData
+        {
+            public string Name { get; }
+            public HubMessage Message { get; }
+            public int Size { get; }
+
+            public MessageSizeTestData(string name, HubMessage message, int size)
+            {
+                Name = name;
+                Message = message;
+                Size = size;
+            }
+
+            public override string ToString() => Name;
+        }
     }
 }