[main] Update dependencies from dotnet/efcore dotnet/runtime

src/Components/WebAssembly/Server/src/TargetPickerUi.cs

@@ -71,11 +71,11 @@ Ensure your browser is running with debugging enabled.
 <h2>Resolution</h2>
 <p>
     <h4>If you are using Google Chrome for your development, follow these instructions:</h4>
-    {GetLaunchChromeInstructions(targetApplicationUrl)}
+    {GetLaunchChromeInstructions(targetApplicationUrl.ToString())}
 </p>
 <p>
     <h4>If you are using Microsoft Edge (80+) for your development, follow these instructions:</h4>
-    {GetLaunchEdgeInstructions(targetApplicationUrl)}
+    {GetLaunchEdgeInstructions(targetApplicationUrl.ToString())}
 </p>
 <strong>This should launch a new browser window with debugging enabled..</p>
 <h2>Underlying exception:</h2>

src/FileProviders/Embedded/src/Manifest/ManifestDirectoryInfo.cs

@@ -25,7 +25,7 @@ public ManifestDirectoryInfo(ManifestDirectory directory, DateTimeOffset lastMod
 
         public string? PhysicalPath => null;
 
-        public string? Name => Directory.Name;
+        public string Name => Directory.Name;
 
         public DateTimeOffset LastModified { get; }
 

src/FileProviders/Embedded/src/Manifest/ManifestFileInfo.cs

@@ -38,7 +38,7 @@ public ManifestFileInfo(Assembly assembly, ManifestFile file, DateTimeOffset las
 
         public string? PhysicalPath => null;
 
-        public string? Name => ManifestFile.Name;
+        public string Name => ManifestFile.Name;
 
         public DateTimeOffset LastModified { get; }
 

src/Http/Headers/src/HeaderUtilities.cs

@@ -241,24 +241,26 @@ public static bool TryParseSeconds(StringValues headerValues, string targetValue
 
             for (var i = 0; i < headerValues.Count; i++)
             {
+                var segment = headerValues[i]!;
+
                 // Trim leading white space
-                var current = HttpRuleParser.GetWhitespaceLength(headerValues[i], 0);
+                var current = HttpRuleParser.GetWhitespaceLength(segment, 0);
 
-                while (current < headerValues[i].Length)
+                while (current < segment.Length)
                 {
                     long seconds;
                     var initial = current;
                     var tokenLength = HttpRuleParser.GetTokenLength(headerValues[i], current);
                     if (tokenLength == targetValue.Length
                         && string.Compare(headerValues[i], current, targetValue, 0, tokenLength, StringComparison.OrdinalIgnoreCase) == 0
-                        && TryParseNonNegativeInt64FromHeaderValue(current + tokenLength, headerValues[i], out seconds))
+                        && TryParseNonNegativeInt64FromHeaderValue(current + tokenLength, segment, out seconds))
                     {
                         // Token matches target value and seconds were parsed
                         value = TimeSpan.FromSeconds(seconds);
                         return true;
                     }
 
-                    current = AdvanceCacheDirectiveIndex(current + tokenLength, headerValues[i]);
+                    current = AdvanceCacheDirectiveIndex(current + tokenLength, segment);
 
                     // Ensure index was advanced
                     if (current <= initial)
@@ -295,22 +297,24 @@ public static bool ContainsCacheDirective(StringValues cacheControlDirectives, s
 
             for (var i = 0; i < cacheControlDirectives.Count; i++)
             {
+                var segment = cacheControlDirectives[i]!;
+
                 // Trim leading white space
-                var current = HttpRuleParser.GetWhitespaceLength(cacheControlDirectives[i], 0);
+                var current = HttpRuleParser.GetWhitespaceLength(segment, 0);
 
-                while (current < cacheControlDirectives[i].Length)
+                while (current < segment.Length)
                 {
                     var initial = current;
 
-                    var tokenLength = HttpRuleParser.GetTokenLength(cacheControlDirectives[i], current);
+                    var tokenLength = HttpRuleParser.GetTokenLength(segment, current);
                     if (tokenLength == targetDirectives.Length
-                        && string.Compare(cacheControlDirectives[i], current, targetDirectives, 0, tokenLength, StringComparison.OrdinalIgnoreCase) == 0)
+                        && string.Compare(segment, current, targetDirectives, 0, tokenLength, StringComparison.OrdinalIgnoreCase) == 0)
                     {
                         // Token matches target value
                         return true;
                     }
 
-                    current = AdvanceCacheDirectiveIndex(current + tokenLength, cacheControlDirectives[i]);
+                    current = AdvanceCacheDirectiveIndex(current + tokenLength, segment);
 
                     // Ensure index was advanced
                     if (current <= initial)

src/Http/Headers/src/MediaTypeHeaderValue.cs

@@ -76,7 +76,7 @@ public StringSegment Charset
         {
             get
             {
-                return NameValueHeaderValue.Find(_parameters, CharsetString)?.Value.Value;
+                return NameValueHeaderValue.Find(_parameters, CharsetString)?.Value ?? default;
             }
             set
             {
@@ -115,7 +115,9 @@ public Encoding? Encoding
             get
             {
                 var charset = Charset;
-                if (!StringSegment.IsNullOrEmpty(charset))
+
+                // Check HasValue; IsNullOrEmpty lacks [MemberNotNullWhen(false, nameof(Value))].
+                if (charset.HasValue && !StringSegment.IsNullOrEmpty(charset))
                 {
                     try
                     {

src/Http/Http.Abstractions/src/Extensions/HeaderDictionaryExtensions.cs

@@ -41,7 +41,10 @@ public static void AppendCommaSeparatedValues(this IHeaderDictionary headers, st
         /// <returns>the associated values from the collection separated into individual values, or StringValues.Empty if the key is not present.</returns>
         public static string[] GetCommaSeparatedValues(this IHeaderDictionary headers, string key)
         {
+            // GetHeaderSplit will return only non-null elements of the given IHeaderDictionary.
+#pragma warning disable CS8619 // Nullability of reference types in value doesn't match target type.
             return ParsingHelpers.GetHeaderSplit(headers, key).ToArray();
+#pragma warning restore CS8619 // Nullability of reference types in value doesn't match target type.
         }
 
         /// <summary>

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

@@ -143,7 +143,7 @@ public string ToUriComponent()
                 GetParts(_value, out var host, out var port);
 
                 var mapping = new IdnMapping();
-                var encoded = mapping.GetAscii(host.Buffer, host.Offset, host.Length);
+                var encoded = mapping.GetAscii(host.Buffer!, host.Offset, host.Length);
 
                 return StringSegment.IsNullOrEmpty(port)
                     ? encoded

src/Http/Http.Abstractions/src/HttpResponse.cs

@@ -63,7 +63,7 @@ public abstract class HttpResponse
         /// <summary>
         /// Gets or sets the value for the <c>Content-Type</c> response header.
         /// </summary>
-        public abstract string ContentType { get; set; }
+        public abstract string? ContentType { get; set; }
 
         /// <summary>
         /// Gets an object that can be used to manage cookies for this response.

src/Http/Http.Abstractions/src/Internal/ParsingHelpers.cs

@@ -69,7 +69,7 @@ public static void SetHeaderJoined(IHeaderDictionary headers, string key, String
         }
 
         // Quote items that contain commas and are not already quoted.
-        private static string QuoteIfNeeded(string value)
+        private static string? QuoteIfNeeded(string? value)
         {
             if (!string.IsNullOrEmpty(value) &&
                 value.Contains(',') &&
@@ -80,7 +80,7 @@ private static string QuoteIfNeeded(string value)
             return value;
         }
 
-        private static string DeQuote(string value)
+        private static string? DeQuote(string? value)
         {
             if (!string.IsNullOrEmpty(value) &&
                 (value.Length > 1 && value[0] == '"' && value[value.Length - 1] == '"'))
@@ -129,7 +129,7 @@ public static void AppendHeaderJoined(IHeaderDictionary headers, string key, par
                 return;
             }
 
-            string existing = GetHeader(headers, key);
+            string? existing = GetHeader(headers, key);
             if (existing == null)
             {
                 SetHeaderJoined(headers, key, values);

src/Http/Http.Abstractions/src/PublicAPI.Unshipped.txt

@@ -5,6 +5,7 @@
 *REMOVED*static Microsoft.AspNetCore.Builder.UseMiddlewareExtensions.UseMiddleware(this Microsoft.AspNetCore.Builder.IApplicationBuilder! app, System.Type! middleware, params object![]! args) -> Microsoft.AspNetCore.Builder.IApplicationBuilder!
 *REMOVED*static Microsoft.AspNetCore.Builder.UseMiddlewareExtensions.UseMiddleware<TMiddleware>(this Microsoft.AspNetCore.Builder.IApplicationBuilder! app, params object![]! args) -> Microsoft.AspNetCore.Builder.IApplicationBuilder!
 *REMOVED*abstract Microsoft.AspNetCore.Http.HttpRequest.ContentType.get -> string!
+*REMOVED*abstract Microsoft.AspNetCore.Http.HttpResponse.ContentType.get -> string!
 Microsoft.AspNetCore.Http.IResult
 Microsoft.AspNetCore.Http.IResult.ExecuteAsync(Microsoft.AspNetCore.Http.HttpContext! httpContext) -> System.Threading.Tasks.Task!
 Microsoft.AspNetCore.Http.Metadata.IAcceptsMetadata
@@ -26,6 +27,7 @@ Microsoft.AspNetCore.Http.RequestDelegateResult.EndpointMetadata.get -> System.C
 Microsoft.AspNetCore.Http.RequestDelegateResult.RequestDelegate.get -> Microsoft.AspNetCore.Http.RequestDelegate!
 Microsoft.AspNetCore.Http.RequestDelegateResult.RequestDelegateResult(Microsoft.AspNetCore.Http.RequestDelegate! requestDelegate, System.Collections.Generic.IReadOnlyList<object!>! metadata) -> void
 Microsoft.AspNetCore.Routing.RouteValueDictionary.TryAdd(string! key, object? value) -> bool
+abstract Microsoft.AspNetCore.Http.HttpResponse.ContentType.get -> string?
 static readonly Microsoft.AspNetCore.Http.HttpProtocol.Http09 -> string!
 static Microsoft.AspNetCore.Http.HttpProtocol.IsHttp09(string! protocol) -> bool
 abstract Microsoft.AspNetCore.Http.HttpRequest.ContentType.get -> string?

src/Http/Http.Extensions/src/HeaderDictionaryTypeExtensions.cs

@@ -207,7 +207,7 @@ internal static void SetDate(this IHeaderDictionary headers, string name, DateTi
             if (KnownParsers.TryGetValue(typeof(T), out var temp))
             {
                 var func = (Func<string, T>)temp;
-                return func(value);
+                return func(value.ToString());
             }
 
             return GetViaReflection<T>(value.ToString());

src/Http/Http.Extensions/src/QueryBuilder.cs

@@ -40,7 +40,7 @@ public QueryBuilder(IEnumerable<KeyValuePair<string, string>> parameters)
         /// </summary>
         /// <param name="parameters">The parameters to initialize the instance with.</param>
         public QueryBuilder(IEnumerable<KeyValuePair<string, StringValues>> parameters)
-            : this(parameters.SelectMany(kvp => kvp.Value, (kvp, v) => KeyValuePair.Create(kvp.Key, v)))
+            : this(parameters.SelectMany(kvp => kvp.Value, (kvp, v) => KeyValuePair.Create(kvp.Key, v ?? string.Empty)))
         {
 
         }

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

@@ -219,7 +219,7 @@ public HostString Host
         {
             get
             {
-                return HostString.FromUriComponent(Headers.Host);
+                return HostString.FromUriComponent(Headers.Host.ToString());
             }
             set
             {

src/Http/Http/src/FormFile.cs

@@ -1,12 +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;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Net.Http.Headers;
-
 namespace Microsoft.AspNetCore.Http
 {
     /// <summary>
@@ -42,7 +36,7 @@ public FormFile(Stream baseStream, long baseStreamOffset, long length, string na
         /// </summary>
         public string ContentDisposition
         {
-            get { return Headers.ContentDisposition; }
+            get { return Headers.ContentDisposition.ToString(); }
             set { Headers.ContentDisposition = value; }
         }
 
@@ -51,7 +45,7 @@ public string ContentDisposition
         /// </summary>
         public string ContentType
         {
-            get { return Headers.ContentType; }
+            get { return Headers.ContentType.ToString(); }
             set { Headers.ContentType = value; }
         }
 

src/Http/Http/src/Internal/DefaultHttpRequest.cs

@@ -119,7 +119,7 @@ public override bool IsHttps
 
         public override HostString Host
         {
-            get { return HostString.FromUriComponent(Headers.Host); }
+            get { return HostString.FromUriComponent(Headers.Host.ToString()); }
             set { Headers.Host = value.ToUriComponent(); }
         }
 

src/Http/Http/src/Internal/DefaultHttpResponse.cs

@@ -90,7 +90,7 @@ public override long? ContentLength
             set { Headers.ContentLength = value; }
         }
 
-        public override string ContentType
+        public override string? ContentType
         {
             get
             {

src/Http/Http/src/Internal/ResponseCookies.cs

@@ -192,9 +192,10 @@ public void Delete(string key, CookieOptions options)
 
                 for (var i = 0; i < values.Length; i++)
                 {
-                    if (!rejectPredicate(values[i], encodedKeyPlusEquals, options))
+                    var value = values[i]!;
+                    if (!rejectPredicate(value, encodedKeyPlusEquals, options))
                     {
-                        newValues.Add(values[i]);
+                        newValues.Add(value);
                     }
                 }
 

src/Http/Routing/src/DataSourceDependentCache.cs

@@ -18,7 +18,7 @@ internal sealed class DataSourceDependentCache<T> : IDisposable where T : class
         private readonly EndpointDataSource _dataSource;
         private readonly Func<IReadOnlyList<Endpoint>, T> _initializeCore;
         private readonly Func<T> _initializer;
-        private readonly Action<object> _initializerWithState;
+        private readonly Action<object?> _initializerWithState;
 
         private object _lock;
         private bool _initialized;

src/Http/Routing/src/Matching/HttpMethodDictionaryPolicyJumpTable.cs

@@ -36,7 +36,7 @@ public override int GetDestination(HttpContext httpContext)
             var httpMethod = httpContext.Request.Method;
             if (_supportsCorsPreflight && HttpMethodMatcherPolicy.IsCorsPreflightRequest(httpContext, httpMethod, out var accessControlRequestMethod))
             {
-                return _corsPreflightDestinations!.TryGetValue(accessControlRequestMethod, out destination)
+                return _corsPreflightDestinations!.TryGetValue(accessControlRequestMethod.ToString(), out destination)
                     ? destination
                     : _corsPreflightExitDestination;
             }

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

@@ -138,7 +138,7 @@ public Task ApplyAsync(HttpContext httpContext, CandidateSet candidates)
                     !StringValues.IsNullOrEmpty(accessControlRequestMethod))
                 {
                     needs405Endpoint = false; // We don't return a 405 for a CORS preflight request when the endpoints accept CORS preflight.
-                    httpMethod = accessControlRequestMethod;
+                    httpMethod = accessControlRequestMethod.ToString();
                 }
 
                 var matched = false;

src/Http/Routing/src/Matching/HttpMethodSingleEntryPolicyJumpTable.cs

@@ -36,7 +36,7 @@ public override int GetDestination(HttpContext httpContext)
             var httpMethod = httpContext.Request.Method;
             if (_supportsCorsPreflight && HttpMethodMatcherPolicy.IsCorsPreflightRequest(httpContext, httpMethod, out var accessControlRequestMethod))
             {
-                return HttpMethods.Equals(accessControlRequestMethod, _method) ? _corsPreflightDestination : _corsPreflightExitDestination;
+                return HttpMethods.Equals(accessControlRequestMethod.ToString(), _method) ? _corsPreflightDestination : _corsPreflightExitDestination;
             }
 
             return HttpMethods.Equals(httpMethod, _method) ? _destination : _exitDestination;

src/Http/Shared/CookieHeaderParserShared.cs

@@ -1,8 +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;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
 using Microsoft.Extensions.Primitives;
@@ -31,12 +29,9 @@ public static bool TryParseValues(StringValues values, IDictionary<string, strin
                     if (TryParseValue(value, ref index, supportsMultipleValues, out var parsedName, out var parsedValue))
                     {
                         // The entry may not contain an actual value, like " , "
-                        if (parsedName != null && parsedValue != null)
-                        {
-                            var name = enableCookieNameEncoding ? Uri.UnescapeDataString(parsedName.Value.Value) : parsedName.Value.Value;
-                            store[name] = Uri.UnescapeDataString(parsedValue.Value.Value);
-                            hasFoundValue = true;
-                        }
+                        var name = enableCookieNameEncoding ? Uri.UnescapeDataString(parsedName.Value.Value!) : parsedName.Value.Value!;
+                        store[name] = Uri.UnescapeDataString(parsedValue.Value.Value!);
+                        hasFoundValue = true;
                     }
                     else
                     {

src/Http/WebUtilities/src/KeyValueAccumulator.cs

@@ -30,15 +30,15 @@ public void Append(string key, string value)
             StringValues values;
             if (_accumulator.TryGetValue(key, out values))
             {
-                if (values.Count == 0)
+                if (StringValues.IsNullOrEmpty(values))
                 {
                     // Marker entry for this key to indicate entry already in expanding list dictionary
                     _expandingAccumulator[key].Add(value);
                 }
                 else if (values.Count == 1)
                 {
                     // Second value for this key
-                    _accumulator[key] = new string[] { values[0], value };
+                    _accumulator[key] = new string[] { values[0]!, value };
                 }
                 else
                 {
@@ -55,8 +55,8 @@ public void Append(string key, string value)
                     var list = new List<string>(8);
                     var array = values.ToArray();
 
-                    list.Add(array[0]);
-                    list.Add(array[1]);
+                    list.Add(array[0]!);
+                    list.Add(array[1]!);
                     list.Add(value);
 
                     _expandingAccumulator[key] = list;

src/Middleware/CORS/src/Infrastructure/CorsService.cs

@@ -135,7 +135,7 @@ private static void PopulateResult(HttpContext context, CorsPolicy policy, CorsR
             AddHeaderValues(result.AllowedExposedHeaders, policy.ExposedHeaders);
 
             var allowedMethods = policy.AllowAnyMethod ?
-                new[] { result.IsPreflightRequest ? (string)headers.AccessControlRequestMethod : context.Request.Method } :
+                new[] { result.IsPreflightRequest ? headers.AccessControlRequestMethod.ToString() : context.Request.Method } :
                 policy.Methods;
             AddHeaderValues(result.AllowedMethods, allowedMethods);
 
@@ -253,14 +253,15 @@ private bool IsOriginAllowed(CorsPolicy policy, StringValues origin)
                 return false;
             }
 
-            _logger.RequestHasOriginHeader(origin);
-            if (policy.AllowAnyOrigin || policy.IsOriginAllowed(origin))
+            var originString = origin.ToString();
+            _logger.RequestHasOriginHeader(originString);
+            if (policy.AllowAnyOrigin || policy.IsOriginAllowed(originString))
             {
                 _logger.PolicySuccess();
                 return true;
             }
             _logger.PolicyFailure();
-            _logger.OriginNotAllowed(origin);
+            _logger.OriginNotAllowed(originString);
             return false;
         }
     }