PR feedback

Author: pranavkm

src/Http/Routing/src/Matching/HttpMethodMatcherPolicy.cs

@@ -20,8 +20,6 @@ namespace Microsoft.AspNetCore.Routing.Matching
     public sealed class HttpMethodMatcherPolicy : MatcherPolicy, IEndpointComparerPolicy, INodeBuilderPolicy, IEndpointSelectorPolicy
     {
         // Used in tests
-        internal const string OriginHeader = "Origin";
-        internal const string AccessControlRequestMethod = "Access-Control-Request-Method";
         internal static readonly string PreflightHttpMethod = HttpMethods.Options;
 
         // Used in tests

src/Http/Routing/test/UnitTests/Matching/HttpMethodMatcherPolicyIntegrationTestBase.cs

@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Routing.Patterns;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Net.Http.Headers;
 using Xunit;
 using static Microsoft.AspNetCore.Routing.Matching.HttpMethodMatcherPolicy;
 
@@ -352,8 +353,8 @@ internal static HttpContext CreateContext(
 
             if (corsPreflight)
             {
-                httpContext.Request.Headers[OriginHeader] = "example.com";
-                httpContext.Request.Headers[AccessControlRequestMethod] = httpMethod;
+                httpContext.Request.Headers[HeaderNames.Origin] = "example.com";
+                httpContext.Request.Headers[HeaderNames.AccessControlRequestMethod] = httpMethod;
             }
 
             return httpContext;

src/HttpClientFactory/Polly/src/HttpRequestMessageExtensions.cs

@@ -13,7 +13,9 @@ namespace Polly
     /// </summary>
     public static class HttpRequestMessageExtensions
     {
-        internal const string PolicyExecutionContextKey = "PolicyExecutionContext";
+#pragma warning disable CA1802 //  Use literals where appropriate. Using a static field for reference equality
+        internal static readonly string PolicyExecutionContextKey = "PolicyExecutionContext";
+#pragma warning restore CA1802
 
         /// <summary>
         /// Gets the <see cref="Context"/> associated with the provided <see cref="HttpRequestMessage"/>.

src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.cs

@@ -291,7 +291,9 @@ public static void ValidateHeaderNameCharacters(string headerCharacters)
             }
         }
 
-        private const string KeepAlive = "keep-alive";
+#pragma warning disable CA1802 //  Use literals where appropriate. Using a static field for reference equality
+        private static readonly string KeepAlive = "keep-alive";
+#pragma warning restore CA1802
         private readonly static StringValues ConnectionValueKeepAlive = KeepAlive;
         private readonly static StringValues ConnectionValueClose = "close";
         private readonly static StringValues ConnectionValueUpgrade = HeaderNames.Upgrade;