Merge in 'release/6.0' changes

dotnet · Jan 10, 2022 · 04a113d · 04a113d
2 parents 6ffe8df + 2bd9de6
commit 04a113d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/src/Mvc/Mvc.Razor/src/PublicAPI.Unshipped.txt b/src/Mvc/Mvc.Razor/src/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+*REMOVED*Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>.Model.get -> TModel?
+Microsoft.AspNetCore.Mvc.Razor.RazorPage<TModel>.Model.get -> TModel
diff --git a/src/Mvc/Mvc.Razor/src/RazorPageOfT.cs b/src/Mvc/Mvc.Razor/src/RazorPageOfT.cs
@@ -15,13 +15,12 @@ public abstract class RazorPage<TModel> : RazorPage
         /// <summary>
         /// Gets the Model property of the <see cref="ViewData"/> property.
         /// </summary>
-        public TModel? Model => ViewData == null ? default(TModel) : ViewData.Model;
+        public TModel Model => ViewData.Model;
 
         /// <summary>
         /// Gets or sets the dictionary for view data.
         /// </summary>
         [RazorInject]
         public ViewDataDictionary<TModel> ViewData { get; set; } = default!;
-
     }
 }
diff --git a/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Unshipped.txt b/src/Mvc/Mvc.ViewFeatures/src/PublicAPI.Unshipped.txt
@@ -1 +1,3 @@
 #nullable enable
+*REMOVED*Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TModel>.Model.get -> TModel?
+Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<TModel>.Model.get -> TModel
diff --git a/src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryOfT.cs b/src/Mvc/Mvc.ViewFeatures/src/ViewDataDictionaryOfT.cs
@@ -86,16 +86,10 @@ internal ViewDataDictionary(IModelMetadataProvider metadataProvider)
         }
 
         /// <inheritdoc />
-        public new TModel? Model
+        public new TModel Model
         {
-            get
-            {
-                return (base.Model == null) ? default(TModel) : (TModel)base.Model;
-            }
-            set
-            {
-                base.Model = value;
-            }
+            get => (base.Model is null) ? default! : (TModel)base.Model;
+            set => base.Model = value;
         }
     }
 }
diff --git a/...ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/Error.cshtml b/...ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/Views/Shared/Error.cshtml
@@ -6,10 +6,10 @@
 <h1 class="text-danger">Error.</h1>
 <h2 class="text-danger">An error occurred while processing your request.</h2>
 
-@if (Model?.ShowRequestId ?? false)
+@if (Model.ShowRequestId)
 {
     <p>
-        <strong>Request ID:</strong> <code>@Model?.RequestId</code>
+        <strong>Request ID:</strong> <code>@Model.RequestId</code>
     </p>
 }