Merge remote-tracking branch 'origin/main' into safia/interceptors-rdg

Author: captainsafia

.editorconfig

@@ -87,7 +87,8 @@ dotnet_diagnostic.CA1018.severity = warning
 dotnet_diagnostic.CA1047.severity = warning
 
 # CA1305: Specify IFormatProvider
-dotnet_diagnostic.CA1305.severity = warning
+# TODO: Renable as warning after https://github.com/dotnet/roslyn-analyzers/issues/6746 is resolved
+dotnet_diagnostic.CA1305.severity = suggestion
 
 # CA1507: Use nameof to express symbol names
 dotnet_diagnostic.CA1507.severity = warning

eng/Version.Details.xml

@@ -353,6 +353,10 @@
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>1aa759af23d2a29043ea44fcef5bd6823dafa5d0</Sha>
     </Dependency>
+    <Dependency Name="System.Composition" Version="7.0.0">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
+    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->

eng/Versions.props

@@ -166,6 +166,8 @@
     <MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>8.0.0-alpha.1.23326.1</MicrosoftSourceBuildIntermediatesourcebuildreferencepackagesVersion>
     <!-- Packages from dotnet/symreader -->
     <MicrosoftSourceBuildIntermediatesymreaderVersion>2.0.0-beta-23228-03</MicrosoftSourceBuildIntermediatesymreaderVersion>
+    <!-- Packages from dotnet/runtime -->
+    <SystemCompositionVersion>7.0.0</SystemCompositionVersion>
     <!-- Packages from dotnet/xdt -->
     <MicrosoftWebXdtVersion>7.0.0-preview.22423.2</MicrosoftWebXdtVersion>
   </PropertyGroup>

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "8.0.100-preview.7.23321.23"
+    "version": "8.0.100-preview.7.23356.6"
   },
   "tools": {
-    "dotnet": "8.0.100-preview.7.23321.23",
+    "dotnet": "8.0.100-preview.7.23356.6",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"

src/Http/Http.Abstractions/src/HostString.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Buffers;
 using System.Diagnostics;
 using System.Globalization;
 using Microsoft.AspNetCore.Http.Abstractions;
@@ -15,6 +16,15 @@ namespace Microsoft.AspNetCore.Http;
 [DebuggerDisplay("{Value}")]
 public readonly struct HostString : IEquatable<HostString>
 {
+    // Allowed Characters:
+    // A-Z, a-z, 0-9, .,
+    // -, %, [, ], :
+    // Above for IPV6
+    private static readonly SearchValues<char> s_safeHostStringChars =
+        SearchValues.Create("%-.0123456789:ABCDEFGHIJKLMNOPQRSTUVWXYZ[]abcdefghijklmnopqrstuvwxyz");
+
+    private static readonly IdnMapping s_idnMapping = new();
+
     private readonly string _value;
 
     /// <summary>
@@ -121,33 +131,23 @@ public override string ToString()
     /// <returns>The <see cref="HostString"/> value formated for use in a URI or HTTP header.</returns>
     public string ToUriComponent()
     {
-        if (string.IsNullOrEmpty(_value))
+        if (!HasValue)
         {
             return string.Empty;
         }
 
-        int i;
-        for (i = 0; i < _value.Length; ++i)
+        if (!_value.AsSpan().ContainsAnyExcept(s_safeHostStringChars))
         {
-            if (!HostStringHelper.IsSafeHostStringChar(_value[i]))
-            {
-                break;
-            }
+            return _value;
         }
 
-        if (i != _value.Length)
-        {
-            GetParts(_value, out var host, out var port);
-
-            var mapping = new IdnMapping();
-            var encoded = mapping.GetAscii(host.Buffer!, host.Offset, host.Length);
+        GetParts(_value, out var host, out var port);
 
-            return StringSegment.IsNullOrEmpty(port)
-                ? encoded
-                : string.Concat(encoded, ":", port.ToString());
-        }
+        var encoded = s_idnMapping.GetAscii(host.Buffer!, host.Offset, host.Length);
 
-        return _value;
+        return StringSegment.IsNullOrEmpty(port)
+            ? encoded
+            : string.Concat(encoded, ":", port.AsSpan());
     }
 
     /// <summary>
@@ -177,14 +177,12 @@ public static HostString FromUriComponent(string uriComponent)
                 if (index >= 0)
                 {
                     // Has a port
-                    string port = uriComponent.Substring(index);
-                    var mapping = new IdnMapping();
-                    uriComponent = mapping.GetUnicode(uriComponent, 0, index) + port;
+                    var port = uriComponent.AsSpan(index);
+                    uriComponent = string.Concat(s_idnMapping.GetUnicode(uriComponent, 0, index), port);
                 }
                 else
                 {
-                    var mapping = new IdnMapping();
-                    uriComponent = mapping.GetUnicode(uriComponent);
+                    uriComponent = s_idnMapping.GetUnicode(uriComponent);
                 }
             }
         }

src/Http/Http.Abstractions/src/Internal/HostStringHelper.cs

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics;
 using System.Reflection;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.AspNetCore.Http.Metadata;
@@ -10,7 +9,7 @@
 var builder = WebApplication.CreateBuilder(args);
 var app = builder.Build();
 
-app.Logger.LogInformation($"Current process ID: {Process.GetCurrentProcess().Id}");
+app.Logger.LogInformation($"Current process ID: {Environment.ProcessId}");
 
 string Plaintext() => "Hello, World!";
 app.MapGet("/plaintext", Plaintext);

src/Http/samples/MinimalSample/Program.cs

@@ -183,7 +183,7 @@ internal static void AddMvcCoreServices(IServiceCollection services)
         //
         // Action Invoker
         //
-        // The IActionInvokerFactory is cachable
+        // The IActionInvokerFactory is cacheable
         services.TryAddSingleton<IActionInvokerFactory, ActionInvokerFactory>();
         services.TryAddEnumerable(
             ServiceDescriptor.Transient<IActionInvokerProvider, ControllerActionInvokerProvider>());