Fixup

Author: pranavkm

src/Mvc/Mvc.DataAnnotations/test/CompareAttributeAdapterTest.cs

@@ -240,17 +240,17 @@ public void AddValidation_DoesNotTrounceExistingAttributes()
         private class PropertyDisplayNameModel
         {
             [Display(Name = "MyPropertyDisplayName")]
-            public string? MyProperty { get; set; }
+            public string MyProperty { get; set; }
 
             [Display(Name = "OtherPropertyDisplayName")]
-            public string? OtherProperty { get; set; }
+            public string OtherProperty { get; set; }
         }
 
         private class PropertyNameModel
         {
-            public string? MyProperty { get; set; }
+            public string MyProperty { get; set; }
 
-            public string? OtherProperty { get; set; }
+            public string OtherProperty { get; set; }
         }
     }
 }

src/Mvc/Mvc.NewtonsoftJson/src/NewtonsoftJsonInputFormatter.cs

@@ -208,7 +208,7 @@ public override async Task<InputFormatterResult> ReadRequestBodyAsync(
                 }
             }
 
-            if (exception is not null && exception is not JsonException or OverflowException or FormatException)
+            if (exception is not null && exception is not (JsonException or OverflowException or FormatException))
             {
                 // At this point we've already recorded all exceptions as an entry in the ModelStateDictionary.
                 // We only need to rethrow an exception if we believe it needs to be handled by something further up

src/Mvc/Mvc.Razor/src/ApplicationParts/CompiledRazorAssemblyPart.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;
@@ -28,7 +28,7 @@ public CompiledRazorAssemblyPart(Assembly assembly)
         public Assembly Assembly { get; }
 
         /// <inheritdoc />
-        public override string Name => Assembly.GetName().Name;
+        public override string Name => Assembly.GetName().Name!;
 
         IEnumerable<RazorCompiledItem> IRazorCompiledItemProvider.CompiledItems
         {

src/Mvc/Mvc.Razor/src/Compilation/CompiledViewDescriptor.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;
@@ -33,7 +33,6 @@ public CompiledViewDescriptor(RazorCompiledItem item)
             }
 
             Item = item;
-            ExpirationTokens = Array.Empty<IChangeToken>();
             RelativePath = ViewPath.NormalizePath(item.Identifier);
         }
 
@@ -69,14 +68,13 @@ public CompiledViewDescriptor(RazorCompiledItem item, RazorViewAttribute attribu
             // We don't have access to the file provider here so we can't check if the files
             // even exist or what their checksums are. For now leave this empty, it will be updated
             // later.
-            ExpirationTokens = Array.Empty<IChangeToken>();
             RelativePath = ViewPath.NormalizePath(item?.Identifier ?? attribute.Path);
         }
 
         /// <summary>
         /// The normalized application relative path of the view.
         /// </summary>
-        public string RelativePath { get; set; }
+        public string RelativePath { get; set; } = default!;
 
 #pragma warning disable CS0618
         // Type or member is obsolete
@@ -87,22 +85,22 @@ public CompiledViewDescriptor(RazorCompiledItem item, RazorViewAttribute attribu
         /// May be <c>null</c>.
         /// </remarks>
         [Obsolete("Use Item instead. RazorViewAttribute has been superseded by RazorCompiledItem and will not be used by the runtime.")]
-        public RazorViewAttribute ViewAttribute { get; set; }
+        public RazorViewAttribute? ViewAttribute { get; set; }
 #pragma warning restore CS0618 // Type or member is obsolete
 
         /// <summary>
         /// <see cref="IChangeToken"/> instances that indicate when this result has expired.
         /// </summary>
-        public IList<IChangeToken> ExpirationTokens { get; set; }
+        public IList<IChangeToken>? ExpirationTokens { get; set; }
 
         /// <summary>
         /// Gets the <see cref="RazorCompiledItem"/> descriptor for this view.
         /// </summary>
-        public RazorCompiledItem Item { get; set; }
+        public RazorCompiledItem? Item { get; set; }
 
         /// <summary>
         /// Gets the type of the compiled item.
         /// </summary>
-        public Type Type => Item?.Type;
+        public Type? Type => Item?.Type;
     }
 }

src/Mvc/Mvc.Razor/src/Compilation/DefaultRazorPageFactoryProvider.cs

@@ -47,7 +47,7 @@ public RazorPageFactoryResult CreateFactory(string relativePath)
             if (viewType != null)
             {
                 var newExpression = Expression.New(viewType);
-                var pathProperty = viewType.GetProperty(nameof(IRazorPage.Path));
+                var pathProperty = viewType.GetProperty(nameof(IRazorPage.Path))!;
 
                 // Generate: page.Path = relativePath;
                 // Use the normalized path specified from the result.

src/Mvc/Mvc.Razor/src/DefaultTagHelperFactory.cs

@@ -76,7 +76,7 @@ private static void InitializeTagHelper<TTagHelper>(TTagHelper tagHelper, ViewCo
         {
             // Run any tag helper initializers in the container
             var serviceProvider = context.HttpContext.RequestServices;
-            var initializers = serviceProvider.GetService<IEnumerable<ITagHelperInitializer<TTagHelper>>>();
+            var initializers = serviceProvider.GetService<IEnumerable<ITagHelperInitializer<TTagHelper>>>()!;
 
             foreach (var initializer in initializers)
             {

src/Mvc/Mvc.Razor/src/IRazorPage.cs

@@ -21,7 +21,7 @@ public interface IRazorPage
         /// <summary>
         /// Gets or sets the body content.
         /// </summary>
-        IHtmlContent BodyContent { get; set; }
+        IHtmlContent? BodyContent { get; set; }
 
         /// <summary>
         /// Gets or sets a flag that determines if the layout of this page is being rendered.
@@ -41,7 +41,7 @@ public interface IRazorPage
         /// <summary>
         /// Gets or sets the path of a layout page.
         /// </summary>
-        string Layout { get; set; }
+        string? Layout { get; set; }
 
         /// <summary>
         /// Gets or sets the sections that can be rendered by this page.
@@ -67,4 +67,4 @@ public interface IRazorPage
         /// defined and the body was not rendered.</exception>
         void EnsureRenderedBodyOrSections();
     }
-}
+}

src/Mvc/Mvc.Razor/src/IRazorViewEngine.cs

@@ -45,6 +45,6 @@ public interface IRazorViewEngine : IViewEngine
         /// <paramref name="pagePath"/> is a relative path. The <paramref name="pagePath"/> value (unchanged)
         /// otherwise.
         /// </returns>
-        string GetAbsolutePath(string executingFilePath, string pagePath);
+        string? GetAbsolutePath(string? executingFilePath, string? pagePath);
     }
-}
+}

src/Mvc/Mvc.Razor/src/Microsoft.AspNetCore.Mvc.Razor.csproj

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

src/Mvc/Mvc.Razor/src/MvcRazorLoggerExtensions.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;
@@ -11,25 +11,24 @@ internal static class MvcRazorLoggerExtensions
     {
         private static readonly double TimestampToTicks = TimeSpan.TicksPerSecond / (double)Stopwatch.Frequency;
 
-        private static readonly Action<ILogger, string, Exception> _generatedCodeToAssemblyCompilationStart;
-        private static readonly Action<ILogger, string, double, Exception> _generatedCodeToAssemblyCompilationEnd;
+        private static readonly Action<ILogger, string, Exception?> _generatedCodeToAssemblyCompilationStart;
+        private static readonly Action<ILogger, string, double, Exception?> _generatedCodeToAssemblyCompilationEnd;
 
-        private static readonly Action<ILogger, string, Exception> _viewCompilerStartCodeGeneration;
-        private static readonly Action<ILogger, string, double, Exception> _viewCompilerEndCodeGeneration;
-        private static readonly Action<ILogger, string, Exception> _viewCompilerLocatedCompiledView;
-        private static readonly Action<ILogger, Exception> _viewCompilerNoCompiledViewsFound;
-        private static readonly Action<ILogger, string, Exception> _viewCompilerLocatedCompiledViewForPath;
-        private static readonly Action<ILogger, string, Exception> _viewCompilerRecompilingCompiledView;
-        private static readonly Action<ILogger, string, Exception> _viewCompilerCouldNotFindFileToCompileForPath;
-        private static readonly Action<ILogger, string, Exception> _viewCompilerFoundFileToCompileForPath;
-        private static readonly Action<ILogger, string, Exception> _viewCompilerInvalidatingCompiledFile;
+        private static readonly Action<ILogger, string, Exception?> _viewCompilerStartCodeGeneration;
+        private static readonly Action<ILogger, string, double, Exception?> _viewCompilerEndCodeGeneration;
+        private static readonly Action<ILogger, string, Exception?> _viewCompilerLocatedCompiledView;
+        private static readonly Action<ILogger, Exception?> _viewCompilerNoCompiledViewsFound;
+        private static readonly Action<ILogger, string, Exception?> _viewCompilerLocatedCompiledViewForPath;
+        private static readonly Action<ILogger, string, Exception?> _viewCompilerCouldNotFindFileToCompileForPath;
+        private static readonly Action<ILogger, string, Exception?> _viewCompilerFoundFileToCompileForPath;
+        private static readonly Action<ILogger, string, Exception?> _viewCompilerInvalidatingCompiledFile;
 
-        private static readonly Action<ILogger, string, string, Exception> _viewLookupCacheMiss;
-        private static readonly Action<ILogger, string, string, Exception> _viewLookupCacheHit;
-        private static readonly Action<ILogger, string, Exception> _precompiledViewFound;
+        private static readonly Action<ILogger, string, string?, Exception?> _viewLookupCacheMiss;
+        private static readonly Action<ILogger, string, string?, Exception?> _viewLookupCacheHit;
+        private static readonly Action<ILogger, string, Exception?> _precompiledViewFound;
 
-        private static readonly Action<ILogger, string, Exception> _tagHelperComponentInitialized;
-        private static readonly Action<ILogger, string, Exception> _tagHelperComponentProcessed;
+        private static readonly Action<ILogger, string, Exception?> _tagHelperComponentInitialized;
+        private static readonly Action<ILogger, string, Exception?> _tagHelperComponentProcessed;
 
 
         static MvcRazorLoggerExtensions()
@@ -59,11 +58,6 @@ static MvcRazorLoggerExtensions()
                 new EventId(5, "ViewCompilerLocatedCompiledViewForPath"),
                 "Located compiled view for view at path '{Path}'.");
 
-            _viewCompilerRecompilingCompiledView = LoggerMessage.Define<string>(
-                LogLevel.Trace,
-                new EventId(6, "ViewCompilerRecompilingCompiledView"),
-                "Invalidating compiled view for view at path '{Path}'.");
-
             _viewCompilerCouldNotFindFileToCompileForPath = LoggerMessage.Define<string>(
                 LogLevel.Trace,
                 new EventId(7, "ViewCompilerCouldNotFindFileAtPath"),
@@ -79,12 +73,12 @@ static MvcRazorLoggerExtensions()
                 new EventId(9, "ViewCompilerInvalidingCompiledFile"),
                 "Invalidating compiled view at path '{Path}' with a file since the checksum did not match.");
 
-            _viewLookupCacheMiss = LoggerMessage.Define<string, string>(
+            _viewLookupCacheMiss = LoggerMessage.Define<string, string?>(
                 LogLevel.Debug,
                 new EventId(1, "ViewLookupCacheMiss"),
                 "View lookup cache miss for view '{ViewName}' in controller '{ControllerName}'.");
 
-            _viewLookupCacheHit = LoggerMessage.Define<string, string>(
+            _viewLookupCacheHit = LoggerMessage.Define<string, string?>(
                 LogLevel.Debug,
                 new EventId(2, "ViewLookupCacheHit"),
                 "View lookup cache hit for view '{ViewName}' in controller '{ControllerName}'.");
@@ -161,12 +155,12 @@ public static void ViewCompilerInvalidingCompiledFile(this ILogger logger, strin
             _viewCompilerInvalidatingCompiledFile(logger, path, null);
         }
 
-        public static void ViewLookupCacheMiss(this ILogger logger, string viewName, string controllerName)
+        public static void ViewLookupCacheMiss(this ILogger logger, string viewName, string? controllerName)
         {
             _viewLookupCacheMiss(logger, viewName, controllerName, null);
         }
 
-        public static void ViewLookupCacheHit(this ILogger logger, string viewName, string controllerName)
+        public static void ViewLookupCacheHit(this ILogger logger, string viewName, string? controllerName)
         {
             _viewLookupCacheHit(logger, viewName, controllerName, null);
         }