Add nullability to more MVC assemblies

src/Mvc/Mvc.Abstractions/src/ModelBinding/Validation/ModelValidationResult.cs

@@ -13,7 +13,7 @@ public class ModelValidationResult
         /// </summary>
         /// <param name="memberName">The name of the entry on which validation was performed.</param>
         /// <param name="message">The validation message.</param>
-        public ModelValidationResult(string memberName, string message)
+        public ModelValidationResult(string? memberName, string? message)
         {
             MemberName = memberName ?? string.Empty;
             Message = message ?? string.Empty;

src/Mvc/Mvc.Abstractions/src/PublicAPI.Unshipped.txt

@@ -50,6 +50,7 @@
 *REMOVED*Microsoft.AspNetCore.Mvc.Routing.AttributeRouteInfo.Name.get -> string!
 *REMOVED*static Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult.Success(object! model) -> Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult!
 *REMOVED*static Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult.SuccessAsync(object! model) -> System.Threading.Tasks.Task<Microsoft.AspNetCore.Mvc.Formatters.InputFormatterResult!>!
+*REMOVED*Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationResult.ModelValidationResult(string! memberName, string! message) -> void
 Microsoft.AspNetCore.Mvc.Abstractions.ActionDescriptor.RouteValues.get -> System.Collections.Generic.IDictionary<string!, string?>!
 Microsoft.AspNetCore.Mvc.Abstractions.ParameterDescriptor.BindingInfo.get -> Microsoft.AspNetCore.Mvc.ModelBinding.BindingInfo?
 Microsoft.AspNetCore.Mvc.ActionConstraints.ActionConstraintItem.Constraint.get -> Microsoft.AspNetCore.Mvc.ActionConstraints.IActionConstraint?
@@ -101,3 +102,4 @@ virtual Microsoft.AspNetCore.Mvc.Filters.ActionExecutedContext.Result.get -> Mic
 virtual Microsoft.AspNetCore.Mvc.Filters.ActionExecutingContext.ActionArguments.get -> System.Collections.Generic.IDictionary<string!, object?>!
 virtual Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata.BoundConstructorInvoker.get -> System.Func<object?[]!, object!>?
 virtual Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata.ContainerMetadata.get -> Microsoft.AspNetCore.Mvc.ModelBinding.ModelMetadata?
+Microsoft.AspNetCore.Mvc.ModelBinding.Validation.ModelValidationResult.ModelValidationResult(string? memberName, string? message) -> void

src/Mvc/Mvc.Core/src/Formatters/ResponseContentTypeHelper.cs

@@ -1,8 +1,6 @@
 // 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.
 
-#nullable enable
-
 using System.Diagnostics;
 using System.Text;
 using Microsoft.AspNetCore.Http;

src/Mvc/Mvc.Cors/src/CorsAuthorizationFilter.cs

@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Cors.Infrastructure;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Primitives;
@@ -64,15 +65,15 @@ public CorsAuthorizationFilter(
         /// <summary>
         /// The policy name used to fetch a <see cref="CorsPolicy"/>.
         /// </summary>
-        public string PolicyName { get; set; }
+        public string? PolicyName { get; set; }
 
         /// <inheritdoc />
         // Since clients' preflight requests would not have data to authenticate requests, this
         // filter must run before any other authorization filters.
         public int Order => int.MinValue + 100;
 
         /// <inheritdoc />
-        public async Task OnAuthorizationAsync(Filters.AuthorizationFilterContext context)
+        public async Task OnAuthorizationAsync(AuthorizationFilterContext context)
         {
             if (context == null)
             {

src/Mvc/Mvc.Cors/src/CorsAuthorizationFilterFactory.cs

@@ -12,13 +12,13 @@ namespace Microsoft.AspNetCore.Mvc.Cors
     /// </summary>
     internal class CorsAuthorizationFilterFactory : IFilterFactory, IOrderedFilter
     {
-        private readonly string _policyName;
+        private readonly string? _policyName;
 
         /// <summary>
         /// Creates a new instance of <see cref="CorsAuthorizationFilterFactory"/>.
         /// </summary>
         /// <param name="policyName">Name used to fetch a CORS policy.</param>
-        public CorsAuthorizationFilterFactory(string policyName)
+        public CorsAuthorizationFilterFactory(string? policyName)
         {
             _policyName = policyName;
         }

src/Mvc/Mvc.Cors/src/CorsLoggerExtensions.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;
@@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Mvc.Cors
 {
     internal static class CorsLoggerExtensions
     {
-        private static readonly Action<ILogger, Type, Exception> _notMostEffectiveFilter;
+        private static readonly Action<ILogger, Type, Exception?> _notMostEffectiveFilter;
 
         static CorsLoggerExtensions()
         {

src/Mvc/Mvc.Cors/src/Microsoft.AspNetCore.Mvc.Cors.csproj

@@ -7,6 +7,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;aspnetcoremvc;cors</PackageTags>
     <IsPackable>false</IsPackable>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

src/Mvc/Mvc.Cors/src/PublicAPI.Unshipped.txt

@@ -1 +1,18 @@
 #nullable enable
+*REMOVED*~Microsoft.AspNetCore.Mvc.Cors.CorsAuthorizationFilter.CorsAuthorizationFilter(Microsoft.AspNetCore.Cors.Infrastructure.ICorsService corsService, Microsoft.AspNetCore.Cors.Infrastructure.ICorsPolicyProvider policyProvider) -> void
+*REMOVED*~Microsoft.AspNetCore.Mvc.Cors.CorsAuthorizationFilter.CorsAuthorizationFilter(Microsoft.AspNetCore.Cors.Infrastructure.ICorsService corsService, Microsoft.AspNetCore.Cors.Infrastructure.ICorsPolicyProvider policyProvider, Microsoft.Extensions.Logging.ILoggerFactory loggerFactory) -> void
+*REMOVED*~Microsoft.AspNetCore.Mvc.Cors.CorsAuthorizationFilter.OnAuthorizationAsync(Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext context) -> System.Threading.Tasks.Task
+*REMOVED*~Microsoft.AspNetCore.Mvc.Cors.CorsAuthorizationFilter.PolicyName.get -> string
+*REMOVED*~Microsoft.AspNetCore.Mvc.Cors.CorsAuthorizationFilter.PolicyName.set -> void
+*REMOVED*~static Microsoft.Extensions.DependencyInjection.MvcCorsMvcCoreBuilderExtensions.AddCors(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder builder) -> Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder
+*REMOVED*~static Microsoft.Extensions.DependencyInjection.MvcCorsMvcCoreBuilderExtensions.AddCors(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder builder, System.Action<Microsoft.AspNetCore.Cors.Infrastructure.CorsOptions> setupAction) -> Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder
+*REMOVED*~static Microsoft.Extensions.DependencyInjection.MvcCorsMvcCoreBuilderExtensions.ConfigureCors(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder builder, System.Action<Microsoft.AspNetCore.Cors.Infrastructure.CorsOptions> setupAction) -> Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder
+Microsoft.AspNetCore.Mvc.Cors.CorsAuthorizationFilter.CorsAuthorizationFilter(Microsoft.AspNetCore.Cors.Infrastructure.ICorsService! corsService, Microsoft.AspNetCore.Cors.Infrastructure.ICorsPolicyProvider! policyProvider) -> void
+Microsoft.AspNetCore.Mvc.Cors.CorsAuthorizationFilter.CorsAuthorizationFilter(Microsoft.AspNetCore.Cors.Infrastructure.ICorsService! corsService, Microsoft.AspNetCore.Cors.Infrastructure.ICorsPolicyProvider! policyProvider, Microsoft.Extensions.Logging.ILoggerFactory! loggerFactory) -> void
+Microsoft.AspNetCore.Mvc.Cors.CorsAuthorizationFilter.OnAuthorizationAsync(Microsoft.AspNetCore.Mvc.Filters.AuthorizationFilterContext! context) -> System.Threading.Tasks.Task!
+Microsoft.AspNetCore.Mvc.Cors.CorsAuthorizationFilter.PolicyName.get -> string?
+Microsoft.AspNetCore.Mvc.Cors.CorsAuthorizationFilter.PolicyName.set -> void
+static Microsoft.Extensions.DependencyInjection.MvcCorsMvcCoreBuilderExtensions.AddCors(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder! builder) -> Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder!
+static Microsoft.Extensions.DependencyInjection.MvcCorsMvcCoreBuilderExtensions.AddCors(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder! builder, System.Action<Microsoft.AspNetCore.Cors.Infrastructure.CorsOptions!>! setupAction) -> Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder!
+static Microsoft.Extensions.DependencyInjection.MvcCorsMvcCoreBuilderExtensions.ConfigureCors(this Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder! builder, System.Action<Microsoft.AspNetCore.Cors.Infrastructure.CorsOptions!>! setupAction) -> Microsoft.Extensions.DependencyInjection.IMvcCoreBuilder!
+

src/Mvc/Mvc.DataAnnotations/src/AttributeAdapterBase.cs

@@ -22,7 +22,7 @@ public abstract class AttributeAdapterBase<TAttribute> :
         /// </summary>
         /// <param name="attribute">The <see cref="ValidationAttribute"/> being wrapped.</param>
         /// <param name="stringLocalizer">The <see cref="IStringLocalizer"/> to be used in error generation.</param>
-        public AttributeAdapterBase(TAttribute attribute, IStringLocalizer stringLocalizer)
+        public AttributeAdapterBase(TAttribute attribute, IStringLocalizer? stringLocalizer)
             : base(attribute, stringLocalizer)
         {
         }

src/Mvc/Mvc.DataAnnotations/src/CompareAttributeAdapter.cs

@@ -14,7 +14,7 @@ internal class CompareAttributeAdapter : AttributeAdapterBase<CompareAttribute>
     {
         private readonly string _otherProperty;
 
-        public CompareAttributeAdapter(CompareAttribute attribute, IStringLocalizer stringLocalizer)
+        public CompareAttributeAdapter(CompareAttribute attribute, IStringLocalizer? stringLocalizer)
             : base(new CompareAttributeWrapper(attribute), stringLocalizer)
         {
             _otherProperty = "*." + attribute.OtherProperty;
@@ -54,7 +54,7 @@ public override string GetErrorMessage(ModelValidationContextBase validationCont
         // populate OtherPropertyDisplayName until you call FormatErrorMessage.
         private sealed class CompareAttributeWrapper : CompareAttribute
         {
-            public ModelValidationContextBase ValidationContext { get; set; }
+            public ModelValidationContextBase ValidationContext { get; set; } = default!;
 
             public CompareAttributeWrapper(CompareAttribute attribute)
                 : base(attribute.OtherProperty)

src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsClientModelValidatorProvider.cs

@@ -19,7 +19,7 @@ namespace Microsoft.AspNetCore.Mvc.DataAnnotations
     internal class DataAnnotationsClientModelValidatorProvider : IClientModelValidatorProvider
     {
         private readonly IOptions<MvcDataAnnotationsLocalizationOptions> _options;
-        private readonly IStringLocalizerFactory _stringLocalizerFactory;
+        private readonly IStringLocalizerFactory? _stringLocalizerFactory;
         private readonly IValidationAttributeAdapterProvider _validationAttributeAdapterProvider;
 
         /// <summary>
@@ -32,7 +32,7 @@ internal class DataAnnotationsClientModelValidatorProvider : IClientModelValidat
         public DataAnnotationsClientModelValidatorProvider(
             IValidationAttributeAdapterProvider validationAttributeAdapterProvider,
             IOptions<MvcDataAnnotationsLocalizationOptions> options,
-            IStringLocalizerFactory stringLocalizerFactory)
+            IStringLocalizerFactory? stringLocalizerFactory)
         {
             if (validationAttributeAdapterProvider == null)
             {
@@ -55,7 +55,7 @@ public void CreateValidators(ClientValidatorProviderContext context)
             {
                 throw new ArgumentNullException(nameof(context));
             }
-            IStringLocalizer stringLocalizer = null;
+            IStringLocalizer? stringLocalizer = null;
             if (_options.Value.DataAnnotationLocalizerProvider != null && _stringLocalizerFactory != null)
             {
                 // This will pass first non-null type (either containerType or modelType) to delegate.

src/Mvc/Mvc.DataAnnotations/src/DataAnnotationsLocalizationServices.cs

@@ -12,7 +12,7 @@ internal static class DataAnnotationsLocalizationServices
     {
         public static void AddDataAnnotationsLocalizationServices(
             IServiceCollection services,
-            Action<MvcDataAnnotationsLocalizationOptions> setupAction)
+            Action<MvcDataAnnotationsLocalizationOptions>? setupAction)
         {
             services.AddLocalization();
 

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

@@ -2,15 +2,11 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.Diagnostics.Contracts;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.ComTypes;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
 using Microsoft.Extensions.Localization;
@@ -34,14 +30,14 @@ internal class DataAnnotationsMetadataProvider :
         private const string NullableContextAttributeFullName = "System.Runtime.CompilerServices.NullableContextAttribute";
         private const string NullableContextFlagsFieldName = "Flag";
 
-        private readonly IStringLocalizerFactory _stringLocalizerFactory;
+        private readonly IStringLocalizerFactory? _stringLocalizerFactory;
         private readonly MvcOptions _options;
         private readonly MvcDataAnnotationsLocalizationOptions _localizationOptions;
 
         public DataAnnotationsMetadataProvider(
             MvcOptions options,
             IOptions<MvcDataAnnotationsLocalizationOptions> localizationOptions,
-            IStringLocalizerFactory stringLocalizerFactory)
+            IStringLocalizerFactory? stringLocalizerFactory)
         {
             if (options == null)
             {
@@ -120,7 +116,7 @@ public void CreateDisplayMetadata(DisplayMetadataProviderContext context)
             }
 
             var containerType = context.Key.ContainerType ?? context.Key.ModelType;
-            IStringLocalizer localizer = null;
+            IStringLocalizer? localizer = null;
             if (_stringLocalizerFactory != null && _localizationOptions.DataAnnotationLocalizerProvider != null)
             {
                 localizer = _localizationOptions.DataAnnotationLocalizerProvider(containerType, _stringLocalizerFactory);
@@ -201,20 +197,20 @@ public void CreateDisplayMetadata(DisplayMetadataProviderContext context)
                 var groupedDisplayNamesAndValues = new List<KeyValuePair<EnumGroupAndName, string>>();
                 var namesAndValues = new Dictionary<string, string>();
 
-                IStringLocalizer enumLocalizer = null;
+                IStringLocalizer? enumLocalizer = null;
                 if (_stringLocalizerFactory != null && _localizationOptions.DataAnnotationLocalizerProvider != null)
                 {
                     enumLocalizer = _localizationOptions.DataAnnotationLocalizerProvider(underlyingType, _stringLocalizerFactory);
                 }
 
                 var enumFields = Enum.GetNames(underlyingType)
-                    .Select(name => underlyingType.GetField(name))
+                    .Select(name => underlyingType.GetField(name)!)
                     .OrderBy(field => field.GetCustomAttribute<DisplayAttribute>(inherit: false)?.GetOrder() ?? 1000);
 
                 foreach (var field in enumFields)
                 {
                     var groupName = GetDisplayGroup(field);
-                    var value = ((Enum)field.GetValue(obj: null)).ToString("d");
+                    var value = ((Enum)field.GetValue(obj: null)!).ToString("d");
 
                     groupedDisplayNamesAndValues.Add(new KeyValuePair<EnumGroupAndName, string>(
                         new EnumGroupAndName(
@@ -271,9 +267,9 @@ public void CreateDisplayMetadata(DisplayMetadataProviderContext context)
             }
 
             // Order
-            if (displayAttribute?.GetOrder() != null)
+            if (displayAttribute?.GetOrder() is int order)
             {
-                displayMetadata.Order = displayAttribute.GetOrder().Value;
+                displayMetadata.Order = order;
             }
 
             // Placeholder
@@ -374,25 +370,25 @@ public void CreateValidationMetadata(ValidationMetadataProviderContext context)
                         // The only way we could arrive here is if the ModelMetadata was constructed using the non-default provider.
                         // We'll cursorily examine the attributes on the property, but not the ContainerType to make a decision about it's nullability.
 
-                        if (HasNullableAttribute(context.PropertyAttributes, out var propertyHasNullableAttribute))
+                        if (HasNullableAttribute(context.PropertyAttributes!, out var propertyHasNullableAttribute))
                         {
                             addInferredRequiredAttribute = propertyHasNullableAttribute;
                         }
                     }
                     else
                     {
                         addInferredRequiredAttribute = IsNullableReferenceType(
-                            property.DeclaringType,
+                            property.DeclaringType!,
                             member: null,
-                            context.PropertyAttributes);
+                            context.PropertyAttributes!);
                     }
                 }
                 else if (context.Key.MetadataKind == ModelMetadataKind.Parameter)
                 {
                     addInferredRequiredAttribute = IsNullableReferenceType(
-                        context.Key.ParameterInfo?.Member.ReflectedType,
+                        context.Key.ParameterInfo!.Member.ReflectedType,
                         context.Key.ParameterInfo.Member,
-                        context.ParameterAttributes);
+                        context.ParameterAttributes!);
                 }
                 else
                 {
@@ -431,7 +427,7 @@ public void CreateValidationMetadata(ValidationMetadataProviderContext context)
             }
         }
 
-        private static string GetDisplayName(FieldInfo field, IStringLocalizer stringLocalizer)
+        private static string GetDisplayName(FieldInfo field, IStringLocalizer? stringLocalizer)
         {
             var display = field.GetCustomAttribute<DisplayAttribute>(inherit: false);
             if (display != null)
@@ -466,7 +462,7 @@ private static string GetDisplayGroup(FieldInfo field)
             return string.Empty;
         }
 
-        internal static bool IsNullableReferenceType(Type containingType, MemberInfo member, IEnumerable<object> attributes)
+        internal static bool IsNullableReferenceType(Type? containingType, MemberInfo? member, IEnumerable<object> attributes)
         {
             if (HasNullableAttribute(attributes, out var result))
             {
@@ -508,8 +504,13 @@ internal static bool HasNullableAttribute(IEnumerable<object> attributes, out bo
             return true; // [Nullable] found but type is not an NNRT
         }
 
-        internal static bool IsNullableBasedOnContext(Type containingType, MemberInfo member)
+        internal static bool IsNullableBasedOnContext(Type? containingType, MemberInfo? member)
         {
+            if (containingType is null)
+            {
+                return false;
+            }
+
             // For generic types, inspecting the nullability requirement additionally requires
             // inspecting the nullability constraint on generic type parameters. This is fairly non-triviial
             // so we'll just avoid calculating it. Users should still be able to apply an explicit [Required]