Merge branch 'main' of https://github.com/dotnet/aspnetcore into darc-main-1709b9ed-50a0-4e28-b9b8-0e3759aee720

Author: captainsafia

eng/targets/CSharp.Common.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
 
     <!-- Enables Strict mode for Roslyn compiler -->
     <Features>strict;nullablePublicOnly</Features>

eng/targets/CSharp.Common.targets

@@ -29,6 +29,8 @@
         '$(IsMicrobenchmarksProject)' == 'true'">$(NoWarn);CA1416</NoWarn>
 
     <!-- Enable .NET code style analysis during build for src projects. -->
+    <!-- Workaround bug where turning this on produces warnings in VS -->
+    <EnforceCodeStyleInBuild Condition="'$(VisualStudioVersion)' &lt; '17.0'">false</EnforceCodeStyleInBuild>
     <EnforceCodeStyleInBuild Condition="'$(EnforceCodeStyleInBuild)' == ''">true</EnforceCodeStyleInBuild>
   </PropertyGroup>
 

eng/tools/Directory.Build.props

@@ -5,5 +5,6 @@
     <IsPackable>false</IsPackable>
     <DisablePackageReferenceRestrictions>true</DisablePackageReferenceRestrictions>
     <Nullable>disable</Nullable>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
   </PropertyGroup>
 </Project>

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "6.0.100-preview.7.21356.3"
+    "version": "6.0.100-preview.7.21359.3"
   },
   "tools": {
-    "dotnet": "6.0.100-preview.7.21356.3",
+    "dotnet": "6.0.100-preview.7.21359.3",
     "runtimes": {
       "dotnet/x64": [
         "2.1.27",

src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj

@@ -9,6 +9,7 @@
     <SignAssembly>false</SignAssembly>
     <IsTestAssetProject>true</IsTestAssetProject>
     <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
+    <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
   </PropertyGroup>
 
   <ItemGroup>

src/Http/Headers/src/ContentDispositionHeaderValue.cs

@@ -30,6 +30,7 @@ public class ContentDispositionHeaderValue
         private const string ModificationDateString = "modification-date";
         private const string ReadDateString = "read-date";
         private const string SizeString = "size";
+        private const int MaxStackAllocSizeBytes = 256;
         private static readonly char[] QuestionMark = new char[] { '?' };
         private static readonly char[] SingleQuote = new char[] { '\'' };
         private static readonly char[] EscapeChars = new char[] { '\\', '"' };
@@ -543,14 +544,17 @@ private static bool RequiresEncoding(StringSegment input)
 
         // Encode using MIME encoding
         // And adds surrounding quotes, Encoded data must always be quoted, the equals signs are invalid in tokens
+        [SkipLocalsInit]
         private string EncodeMimeWithQuotes(StringSegment input)
         {
             var requiredLength = MimePrefix.Length +
                 Base64.GetMaxEncodedToUtf8Length(Encoding.UTF8.GetByteCount(input.AsSpan())) +
                 MimeSuffix.Length;
-            Span<byte> buffer = requiredLength <= 256
-                ? (stackalloc byte[256]).Slice(0, requiredLength)
-                : new byte[requiredLength];
+            byte[]? bufferFromPool = null;
+            Span<byte> buffer = requiredLength <= MaxStackAllocSizeBytes
+                ? stackalloc byte[MaxStackAllocSizeBytes]
+                : bufferFromPool = ArrayPool<byte>.Shared.Rent(requiredLength);
+            buffer = buffer[..requiredLength];
 
             MimePrefix.CopyTo(buffer);
             var bufferContent = buffer.Slice(MimePrefix.Length);
@@ -560,7 +564,14 @@ private string EncodeMimeWithQuotes(StringSegment input)
 
             MimeSuffix.CopyTo(bufferContent.Slice(base64ContentLength));
 
-            return Encoding.UTF8.GetString(buffer.Slice(0, MimePrefix.Length + base64ContentLength + MimeSuffix.Length));
+            var result = Encoding.UTF8.GetString(buffer.Slice(0, MimePrefix.Length + base64ContentLength + MimeSuffix.Length));
+
+            if (bufferFromPool is not null)
+            {
+                ArrayPool<byte>.Shared.Return(bufferFromPool);
+            }
+
+            return result;
         }
 
         // Attempt to decode MIME encoded strings
@@ -607,32 +618,60 @@ private bool TryDecodeMime(StringSegment input, [NotNullWhen(true)] out string?
 
         // Encode a string using RFC 5987 encoding
         // encoding'lang'PercentEncodedSpecials
+        [SkipLocalsInit]
         private static string Encode5987(StringSegment input)
         {
             var builder = new StringBuilder("UTF-8\'\'");
-            for (int i = 0; i < input.Length; i++)
+
+            var maxInputBytes = Encoding.UTF8.GetMaxByteCount(input.Length);
+            byte[]? bufferFromPool = null;
+            Span<byte> inputBytes = maxInputBytes <= MaxStackAllocSizeBytes
+                ? stackalloc byte[MaxStackAllocSizeBytes]
+                : bufferFromPool = ArrayPool<byte>.Shared.Rent(maxInputBytes);
+
+            var bytesWritten = Encoding.UTF8.GetBytes(input, inputBytes);
+            inputBytes = inputBytes[..bytesWritten];
+
+            int totalBytesConsumed = 0;
+            while (totalBytesConsumed < inputBytes.Length)
             {
-                var c = input[i];
-                // attr-char = ALPHA / DIGIT / "!" / "#" / "$" / "&" / "+" / "-" / "." / "^" / "_" / "`" / "|" / "~"
-                //      ; token except ( "*" / "'" / "%" )
-                if (c > 0x7F) // Encodes as multiple utf-8 bytes
+                if (inputBytes[totalBytesConsumed] <= 0x7F)
                 {
-                    var bytes = Encoding.UTF8.GetBytes(c.ToString());
-                    foreach (byte b in bytes)
+                    // This is an ASCII char. Let's handle it ourselves.
+
+                    char c = (char)inputBytes[totalBytesConsumed];
+                    if (!HttpRuleParser.IsTokenChar(c) || c == '*' || c == '\'' || c == '%')
                     {
-                        HexEscape(builder, (char)b);
+                        HexEscape(builder, c);
                     }
-                }
-                else if (!HttpRuleParser.IsTokenChar(c) || c == '*' || c == '\'' || c == '%')
-                {
-                    // ASCII - Only one encoded byte
-                    HexEscape(builder, c);
+                    else
+                    {
+                        builder.Append(c);
+                    }
+
+                    totalBytesConsumed++;
                 }
                 else
                 {
-                    builder.Append(c);
+                    // Non-ASCII, let's rely on Rune to decode it.
+
+                    Rune.DecodeFromUtf8(inputBytes.Slice(totalBytesConsumed), out Rune r, out int bytesConsumedForRune);
+                    Contract.Assert(!r.IsAscii, "We shouldn't have gotten here if the Rune is ASCII.");
+
+                    for (int i = 0; i < bytesConsumedForRune; i++)
+                    {
+                        HexEscape(builder, (char)inputBytes[totalBytesConsumed + i]);
+                    }
+
+                    totalBytesConsumed += bytesConsumedForRune;
                 }
             }
+
+            if (bufferFromPool is not null)
+            {
+                ArrayPool<byte>.Shared.Return(bufferFromPool);
+            }
+
             return builder.ToString();
         }
 

src/Http/Headers/src/Microsoft.Net.Http.Headers.csproj

@@ -8,6 +8,7 @@
     <PackageTags>http</PackageTags>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>

src/Http/Headers/test/ContentDispositionHeaderValueTest.cs

@@ -600,6 +600,17 @@ public void HeaderNamesWithQuotes_ExpectNamesToNotHaveQuotes()
             Assert.Equal(expectedFileName, result.FileName);
         }
 
+        [Fact]
+        public void FileNameWithSurrogatePairs_EncodedCorrectly()
+        {
+            var contentDisposition = new ContentDispositionHeaderValue("attachment");
+
+            contentDisposition.SetHttpFileName("File 🤩 name.txt");
+            Assert.Equal("File __ name.txt", contentDisposition.FileName);
+            Assert.Equal(2, contentDisposition.Parameters.Count);
+            Assert.Equal("UTF-8\'\'File%20%F0%9F%A4%A9%20name.txt", contentDisposition.Parameters[1].Value);
+        }
+
         public class ContentDispositionValue
         {
             public ContentDispositionValue(string value, string description, bool valid)

src/Http/Http.Extensions/src/HttpValidationProblemDetails.cs

@@ -0,0 +1,45 @@
+// 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.Generic;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Microsoft.AspNetCore.Http.Extensions
+{
+    /// <summary>
+    /// A <see cref="ProblemDetails"/> for validation errors.
+    /// </summary>
+    [JsonConverter(typeof(HttpValidationProblemDetailsJsonConverter))]
+    public class HttpValidationProblemDetails : ProblemDetails
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="HttpValidationProblemDetails"/>.
+        /// </summary>
+        public HttpValidationProblemDetails()
+            : this(new Dictionary<string, string[]>(StringComparer.Ordinal))
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of <see cref="HttpValidationProblemDetails"/> using the specified <paramref name="errors"/>.
+        /// </summary>
+        /// <param name="errors">The validation errors.</param>
+        public HttpValidationProblemDetails(IDictionary<string, string[]> errors)
+            : this(new Dictionary<string, string[]>(errors, StringComparer.Ordinal))
+        {
+        }
+
+        private HttpValidationProblemDetails(Dictionary<string, string[]> errors)
+        {
+            Title = "One or more validation errors occurred.";
+            Errors = errors;
+        }
+
+        /// <summary>
+        /// Gets the validation errors associated with this instance of <see cref="HttpValidationProblemDetails"/>.
+        /// </summary>
+        public IDictionary<string, string[]> Errors { get; } = new Dictionary<string, string[]>(StringComparer.Ordinal);
+    }
+}

src/Http/Http.Extensions/src/Microsoft.AspNetCore.Http.Extensions.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>ASP.NET Core common extension methods for HTTP abstractions, HTTP headers, HTTP request/response, and session state.</Description>
@@ -11,9 +11,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(SharedSourceRoot)ObjectMethodExecutor\**\*.cs" />
-    <Compile Include="$(SharedSourceRoot)TryParseMethodCache.cs" />
-    <Compile Include="..\..\Shared\StreamCopyOperationInternal.cs" />
+    <Compile Include="$(SharedSourceRoot)ObjectMethodExecutor\**\*.cs" LinkBase="Shared"/>
+    <Compile Include="$(SharedSourceRoot)TryParseMethodCache.cs" LinkBase="Shared"/>
+    <Compile Include="..\..\Shared\StreamCopyOperationInternal.cs" LinkBase="Shared" />
+    <Compile Include="$(SharedSourceRoot)ProblemDetailsJsonConverter.cs" LinkBase="Shared"/>
+    <Compile Include="$(SharedSourceRoot)HttpValidationProblemDetailsJsonConverter.cs" LinkBase="Shared" />
   </ItemGroup>
 
   <ItemGroup>