diff --git a/src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs b/src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs
index 5d7070fce860..89c6b4e94118 100644
--- a/src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs
+++ b/src/Hosting/Hosting/src/GenericHost/GenericWebHostedService.cs
@@ -167,6 +167,7 @@ private RequestDelegate BuildErrorPageApplication(Exception exception)
                 .InformationalVersion;
             model.ClrVersion = clrVersion;
             model.OperatingSystemDescription = RuntimeInformation.OSDescription;
+            model.ShowRuntimeDetails = showDetailedErrors;
 
             if (showDetailedErrors)
             {
diff --git a/src/Hosting/Hosting/src/Internal/WebHost.cs b/src/Hosting/Hosting/src/Internal/WebHost.cs
index 504f1d28317b..6e976959e7f4 100644
--- a/src/Hosting/Hosting/src/Internal/WebHost.cs
+++ b/src/Hosting/Hosting/src/Internal/WebHost.cs
@@ -264,6 +264,7 @@ private RequestDelegate BuildApplication()
                     .InformationalVersion;
                 model.ClrVersion = clrVersion;
                 model.OperatingSystemDescription = RuntimeInformation.OSDescription;
+                model.ShowRuntimeDetails = showDetailedErrors;
 
                 if (showDetailedErrors)
                 {
diff --git a/src/Middleware/Diagnostics/Diagnostics.slnf b/src/Middleware/Diagnostics/Diagnostics.slnf
new file mode 100644
index 000000000000..54b140b7bb5f
--- /dev/null
+++ b/src/Middleware/Diagnostics/Diagnostics.slnf
@@ -0,0 +1,45 @@
+{
+  "solution": {
+    "path": "..\\Middleware.sln",
+    "projects": [
+      "..\\Hosting\\Abstractions\\src\\Microsoft.AspNetCore.Hosting.Abstractions.csproj",
+      "..\\Hosting\\Hosting\\src\\Microsoft.AspNetCore.Hosting.csproj",
+      "..\\Hosting\\Server.Abstractions\\src\\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj",
+      "..\\Hosting\\TestHost\\src\\Microsoft.AspNetCore.TestHost.csproj",
+      "..\\Http\\Authentication.Abstractions\\src\\Microsoft.AspNetCore.Authentication.Abstractions.csproj",
+      "..\\Http\\Authentication.Core\\src\\Microsoft.AspNetCore.Authentication.Core.csproj",
+      "..\\Http\\Http.Abstractions\\src\\Microsoft.AspNetCore.Http.Abstractions.csproj",
+      "..\\Http\\Http.Extensions\\src\\Microsoft.AspNetCore.Http.Extensions.csproj",
+      "..\\Http\\Http.Features\\src\\Microsoft.AspNetCore.Http.Features.csproj",
+      "..\\Http\\Metadata\\src\\Microsoft.AspNetCore.Metadata.csproj",
+      "..\\Http\\Routing.Abstractions\\src\\Microsoft.AspNetCore.Routing.Abstractions.csproj",
+      "..\\Http\\WebUtilities\\src\\Microsoft.AspNetCore.WebUtilities.csproj",
+      "..\\Security\\Authorization\\Core\\src\\Microsoft.AspNetCore.Authorization.csproj",
+      "..\\Servers\\Connections.Abstractions\\src\\Microsoft.AspNetCore.Connections.Abstractions.csproj",
+      "..\\Servers\\IIS\\IISIntegration\\src\\Microsoft.AspNetCore.Server.IISIntegration.csproj",
+      "..\\Servers\\Kestrel\\Core\\src\\Microsoft.AspNetCore.Server.Kestrel.Core.csproj",
+      "..\\Servers\\Kestrel\\Kestrel\\src\\Microsoft.AspNetCore.Server.Kestrel.csproj",
+      "..\\Servers\\Kestrel\\Transport.Sockets\\src\\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.csproj",
+      "..\\http\\Headers\\src\\Microsoft.Net.Http.Headers.csproj",
+      "..\\http\\Routing\\src\\Microsoft.AspNetCore.Routing.csproj",
+      "..\\http\\http\\src\\Microsoft.AspNetCore.Http.csproj",
+      "Diagnostics.Abstractions\\src\\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj",
+      "Diagnostics.EntityFrameworkCore\\src\\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.csproj",
+      "Diagnostics.EntityFrameworkCore\\test\\FunctionalTests\\Diagnostics.EFCore.FunctionalTests.csproj",
+      "Diagnostics.EntityFrameworkCore\\test\\UnitTests\\Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests.csproj",
+      "Diagnostics\\src\\Microsoft.AspNetCore.Diagnostics.csproj",
+      "Diagnostics\\test\\FunctionalTests\\Diagnostics.FunctionalTests.csproj",
+      "Diagnostics\\test\\UnitTests\\Microsoft.AspNetCore.Diagnostics.Tests.csproj",
+      "Diagnostics\\test\\testassets\\ClassLibraryWithPortablePdbs\\ClassLibraryWithPortablePdbs.csproj",
+      "Diagnostics\\test\\testassets\\DatabaseErrorPageSample\\DatabaseErrorPageSample.csproj",
+      "Diagnostics\\test\\testassets\\DeveloperExceptionPageSample\\DeveloperExceptionPageSample.csproj",
+      "Diagnostics\\test\\testassets\\ExceptionHandlerSample\\ExceptionHandlerSample.csproj",
+      "Diagnostics\\test\\testassets\\StatusCodePagesSample\\StatusCodePagesSample.csproj",
+      "Diagnostics\\test\\testassets\\WelcomePageSample\\WelcomePageSample.csproj",
+      "HttpOverrides\\src\\Microsoft.AspNetCore.HttpOverrides.csproj",
+      "MiddlewareAnalysis\\samples\\MiddlewareAnalysisSample\\MiddlewareAnalysisSample.csproj",
+      "MiddlewareAnalysis\\src\\Microsoft.AspNetCore.MiddlewareAnalysis.csproj",
+      "StaticFiles\\src\\Microsoft.AspNetCore.StaticFiles.csproj"
+    ]
+  }
+}
diff --git a/src/Servers/IIS/IIS/src/StartupHook.cs b/src/Servers/IIS/IIS/src/StartupHook.cs
index 436a1cd079c6..5f8f3edf5a53 100644
--- a/src/Servers/IIS/IIS/src/StartupHook.cs
+++ b/src/Servers/IIS/IIS/src/StartupHook.cs
@@ -83,7 +83,10 @@ public static void Initialize()
                 new PhysicalFileProvider(contentRoot),
                 sourceCodeLineCount: 6);
 
+            // The startup hook is only present when detailed errors are allowed, so
+            // we can turn on all the details.
             model.ErrorDetails = exceptionDetailProvider.GetDetails(exception);
+            model.ShowRuntimeDetails = true;
 
             var errorPage = new ErrorPage(model);
 
diff --git a/src/Shared/ErrorPage/ErrorPage.Designer.cs b/src/Shared/ErrorPage/ErrorPage.Designer.cs
index 4cfcd48f6bfb..402e3ad49478 100644
--- a/src/Shared/ErrorPage/ErrorPage.Designer.cs
+++ b/src/Shared/ErrorPage/ErrorPage.Designer.cs
@@ -1,87 +1,79 @@
+// <auto-generated/>
+#pragma warning disable 1591
 namespace Microsoft.AspNetCore.Hosting.Views
 {
+    #line hidden
+    using System.Threading.Tasks;
+#nullable restore
 #line 1 "ErrorPage.cshtml"
-using System
+using System;
 
 #line default
 #line hidden
-    ;
+#nullable disable
+#nullable restore
 #line 2 "ErrorPage.cshtml"
-using System.Globalization
+using System.Globalization;
 
 #line default
 #line hidden
-    ;
+#nullable disable
+#nullable restore
 #line 3 "ErrorPage.cshtml"
-using System.Linq
+using System.Linq;
 
 #line default
 #line hidden
-    ;
+#nullable disable
+#nullable restore
 #line 4 "ErrorPage.cshtml"
-using System.Net
+using System.Net;
 
 #line default
 #line hidden
-    ;
+#nullable disable
+#nullable restore
 #line 5 "ErrorPage.cshtml"
-using System.Reflection
+using System.Reflection;
 
 #line default
 #line hidden
-    ;
+#nullable disable
+#nullable restore
 #line 6 "ErrorPage.cshtml"
-using Microsoft.AspNetCore.Hosting.Views
+using Microsoft.AspNetCore.Hosting.Views;
 
 #line default
 #line hidden
-    ;
-    using System.Threading.Tasks;
-
+#nullable disable
     internal class ErrorPage : Microsoft.Extensions.RazorViews.BaseView
     {
-#line 9 "ErrorPage.cshtml"
-
-    public ErrorPage(ErrorPageModel model)
-    {
-        Model = model;
-    }
-
-    public ErrorPageModel Model { get; set; }
-
-#line default
-#line hidden
-        #line hidden
-        public ErrorPage()
-        {
-        }
-
         #pragma warning disable 1998
-        public override async Task ExecuteAsync()
+        public async override global::System.Threading.Tasks.Task ExecuteAsync()
         {
             WriteLiteral("\r\n");
+#nullable restore
 #line 17 "ErrorPage.cshtml"
-
+  
     var location = string.Empty;
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("<!DOCTYPE html>\r\n<html");
-            BeginWriteAttribute("lang", " lang=\"", 422, "\"", 483, 1);
-#line 22 "ErrorPage.cshtml"
-WriteAttributeValue("", 429, CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, 429, 54, false);
+            BeginWriteAttribute("lang", " lang=\"", 366, "\"", 427, 1);
+#nullable restore
+#line 21 "ErrorPage.cshtml"
+WriteAttributeValue("", 373, CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, 373, 54, false);
 
 #line default
 #line hidden
+#nullable disable
             EndWriteAttribute();
-            WriteLiteral(" xmlns=\"http://www.w3.org/1999/xhtml\">\r\n    <head>\r\n        <meta charset=\"utf-8\" />\r\n        <title>");
-#line 25 "ErrorPage.cshtml"
-          Write("Internal Server Error");
-
-#line default
-#line hidden
-            WriteLiteral(@"</title>
+            WriteLiteral(@" xmlns=""http://www.w3.org/1999/xhtml"">
+    <head>
+        <meta charset=""utf-8"" />
+        <title>Internal Server Error</title>
         <style>
             body {
     font-family: 'Segoe UI', Tahoma, Arial, Helvetica, sans-serif;
@@ -133,15 +125,15 @@ body .location {
 
     #header li {
         display: inline;
-        margin: 5px;
+        margin: 5p");
+            WriteLiteral(@"x;
         padding: 5px;
         color: #a0a0a0;
         cursor: pointer;
     }
 
     #header .selected {
-        ba");
-            WriteLiteral(@"ckground: #44c5f2;
+        background: #44c5f2;
         color: #fff;
     }
 
@@ -192,15 +184,15 @@ body .location {
     color: #888;
 }
 
-    #stackpage .source ol.collapsible li span {
+    #stackpage .source ol.collapsible li sp");
+            WriteLiteral(@"an {
         color: #606060;
     }
 
 .page table {
     border-collapse: separate;
     border-spacing: 0;
-    margin:");
-            WriteLiteral(@" 0 0 20px;
+    margin: 0 0 20px;
 }
 
 .page th {
@@ -248,7 +240,8 @@ .page .length {
     font-size: 1.2em;
     text-align: left;
     text-decoration: none;
-    display: inline-block;
+    display: inline-blo");
+            WriteLiteral(@"ck;
     border: 0;
     padding: 0;
 }
@@ -258,8 +251,7 @@ .page .length {
 }
 
 .rawExceptionBlock {
-  ");
-            WriteLiteral(@"  border-top: 1px #ddd solid;
+    border-top: 1px #ddd solid;
     border-bottom: 1px #ddd solid;
 }
 
@@ -285,124 +277,112 @@ .page .length {
         </style>
     </head>
     <body>
-        <h1>");
+        <h1>An error occurred while starting the application.</h1>
+");
+#nullable restore
 #line 226 "ErrorPage.cshtml"
-       Write("An error occurred while starting the application.");
-
-#line default
-#line hidden
-            WriteLiteral("</h1>\r\n");
-#line 227 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 227 "ErrorPage.cshtml"
          foreach (var errorDetail in Model.ErrorDetails)
         {
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("            <div class=\"titleerror\">");
-#line 229 "ErrorPage.cshtml"
+#nullable restore
+#line 228 "ErrorPage.cshtml"
                                Write(errorDetail.Error.GetType().Name);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral(": ");
-#line 229 "ErrorPage.cshtml"
-                                                                          Output.Write(HtmlEncodeAndReplaceLineBreaks(errorDetail.Error.Message));
+#nullable restore
+#line 228 "ErrorPage.cshtml"
+                                                                          Output.Write(HtmlEncodeAndReplaceLineBreaks(errorDetail.Error.Message)); 
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("</div>\r\n");
-#line 230 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 230 "ErrorPage.cshtml"
-
-                var firstFrame = errorDetail.StackFrames.FirstOrDefault();
-                if (firstFrame != null)
-                {
-                    location = firstFrame.Function;
-                }
-
-
-#line default
-#line hidden
-
-#line 236 "ErrorPage.cshtml"
+#nullable restore
+#line 229 "ErrorPage.cshtml"
 
+            var firstFrame = errorDetail.StackFrames.FirstOrDefault();
+            if (firstFrame != null)
+            {
+                location = firstFrame.Function;
+            }
             if (!string.IsNullOrEmpty(location) && firstFrame != null && !string.IsNullOrEmpty(firstFrame.File))
             {
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                <p class=\"location\">");
-#line 239 "ErrorPage.cshtml"
+#nullable restore
+#line 237 "ErrorPage.cshtml"
                                Write(location);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral(" in <code");
-            BeginWriteAttribute("title", " title=\"", 4844, "\"", 4868, 1);
-#line 239 "ErrorPage.cshtml"
-WriteAttributeValue("", 4852, firstFrame.File, 4852, 16, false);
+            BeginWriteAttribute("title", " title=\"", 4736, "\"", 4760, 1);
+#nullable restore
+#line 237 "ErrorPage.cshtml"
+WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 
 #line default
 #line hidden
+#nullable disable
             EndWriteAttribute();
             WriteLiteral(">");
-#line 239 "ErrorPage.cshtml"
+#nullable restore
+#line 237 "ErrorPage.cshtml"
                                                                            Write(System.IO.Path.GetFileName(firstFrame.File));
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("</code>, line ");
-#line 239 "ErrorPage.cshtml"
+#nullable restore
+#line 237 "ErrorPage.cshtml"
                                                                                                                                      Write(firstFrame.Line);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("</p>\r\n");
-#line 240 "ErrorPage.cshtml"
+#nullable restore
+#line 238 "ErrorPage.cshtml"
             }
             else if (!string.IsNullOrEmpty(location))
             {
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                <p class=\"location\">");
-#line 243 "ErrorPage.cshtml"
+#nullable restore
+#line 241 "ErrorPage.cshtml"
                                Write(location);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("</p>\r\n");
-#line 244 "ErrorPage.cshtml"
+#nullable restore
+#line 242 "ErrorPage.cshtml"
             }
             else
             {
 
 #line default
 #line hidden
-
-            WriteLiteral("                <p class=\"location\">");
-#line 247 "ErrorPage.cshtml"
-                               Write("Unknown location");
-
-#line default
-#line hidden
-            WriteLiteral("</p>\r\n");
-#line 248 "ErrorPage.cshtml"
+#nullable disable
+            WriteLiteral("                <p class=\"location\">Unknown location</p>\r\n");
+#nullable restore
+#line 246 "ErrorPage.cshtml"
             }
 
             var reflectionTypeLoadException = errorDetail.Error as ReflectionTypeLoadException;
@@ -413,372 +393,335 @@ .page .length {
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                    <h3>Loader Exceptions:</h3>\r\n                    <ul>\r\n");
-#line 257 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 257 "ErrorPage.cshtml"
+#nullable restore
+#line 255 "ErrorPage.cshtml"
                          foreach (var ex in reflectionTypeLoadException.LoaderExceptions)
                         {
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                            <li>");
-#line 259 "ErrorPage.cshtml"
+#nullable restore
+#line 257 "ErrorPage.cshtml"
                            Write(ex.Message);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("</li>\r\n");
-#line 260 "ErrorPage.cshtml"
+#nullable restore
+#line 258 "ErrorPage.cshtml"
                         }
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                    </ul>\r\n");
-#line 262 "ErrorPage.cshtml"
+#nullable restore
+#line 260 "ErrorPage.cshtml"
                 }
             }
         }
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("        <div id=\"stackpage\" class=\"page\">\r\n            <ul>\r\n");
-#line 267 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 267 "ErrorPage.cshtml"
-
+#nullable restore
+#line 265 "ErrorPage.cshtml"
+                  
                     var exceptionCount = 0;
                     var stackFrameCount = 0;
                     var exceptionDetailId = "";
                     var frameId = "";
-
+                
 
 #line default
 #line hidden
-
-            WriteLiteral("                ");
-#line 273 "ErrorPage.cshtml"
+#nullable disable
+#nullable restore
+#line 271 "ErrorPage.cshtml"
                  foreach (var errorDetail in Model.ErrorDetails)
                 {
-
-
-#line default
-#line hidden
-
-#line 275 "ErrorPage.cshtml"
-
-                        exceptionCount++;
-                        exceptionDetailId = "exceptionDetail" + exceptionCount;
-
-
-#line default
-#line hidden
-
-#line 278 "ErrorPage.cshtml"
-
+                    exceptionCount++;
+                    exceptionDetailId = "exceptionDetail" + exceptionCount;
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                    <li>\r\n                        <h2 class=\"stackerror\">");
-#line 280 "ErrorPage.cshtml"
+#nullable restore
+#line 276 "ErrorPage.cshtml"
                                           Write(errorDetail.Error.GetType().Name);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral(": ");
-#line 280 "ErrorPage.cshtml"
+#nullable restore
+#line 276 "ErrorPage.cshtml"
                                                                              Write(errorDetail.Error.Message);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("</h2>\r\n                        <ul>\r\n");
-#line 282 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 282 "ErrorPage.cshtml"
+#nullable restore
+#line 278 "ErrorPage.cshtml"
                          foreach (var frame in errorDetail.StackFrames)
                         {
-
-
-#line default
-#line hidden
-
-#line 284 "ErrorPage.cshtml"
-
-                                stackFrameCount++;
-                                frameId = "frame" + stackFrameCount;
-
-
-#line default
-#line hidden
-
-#line 287 "ErrorPage.cshtml"
-
+                            stackFrameCount++;
+                            frameId = "frame" + stackFrameCount;
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                            <li class=\"frame\"");
-            BeginWriteAttribute("id", " id=\"", 6874, "\"", 6887, 1);
-#line 288 "ErrorPage.cshtml"
-WriteAttributeValue("", 6879, frameId, 6879, 8, false);
+            BeginWriteAttribute("id", " id=\"", 6616, "\"", 6629, 1);
+#nullable restore
+#line 282 "ErrorPage.cshtml"
+WriteAttributeValue("", 6621, frameId, 6621, 8, false);
 
 #line default
 #line hidden
+#nullable disable
             EndWriteAttribute();
             WriteLiteral(">\r\n");
-#line 289 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 289 "ErrorPage.cshtml"
+#nullable restore
+#line 283 "ErrorPage.cshtml"
                                  if (string.IsNullOrEmpty(frame.File))
                                 {
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                                    <h3>");
-#line 291 "ErrorPage.cshtml"
+#nullable restore
+#line 285 "ErrorPage.cshtml"
                                    Write(frame.Function);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("</h3>\r\n");
-#line 292 "ErrorPage.cshtml"
+#nullable restore
+#line 286 "ErrorPage.cshtml"
                                 }
                                 else
                                 {
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                                    <h3>");
-#line 295 "ErrorPage.cshtml"
+#nullable restore
+#line 289 "ErrorPage.cshtml"
                                    Write(frame.Function);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral(" in <code");
-            BeginWriteAttribute("title", " title=\"", 7232, "\"", 7251, 1);
-#line 295 "ErrorPage.cshtml"
-WriteAttributeValue("", 7240, frame.File, 7240, 11, false);
+            BeginWriteAttribute("title", " title=\"", 6974, "\"", 6993, 1);
+#nullable restore
+#line 289 "ErrorPage.cshtml"
+WriteAttributeValue("", 6982, frame.File, 6982, 11, false);
 
 #line default
 #line hidden
+#nullable disable
             EndWriteAttribute();
             WriteLiteral(">");
-#line 295 "ErrorPage.cshtml"
+#nullable restore
+#line 289 "ErrorPage.cshtml"
                                                                                 Write(System.IO.Path.GetFileName(frame.File));
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("</code></h3>\r\n");
-#line 296 "ErrorPage.cshtml"
+#nullable restore
+#line 290 "ErrorPage.cshtml"
                                 }
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("\r\n");
-#line 298 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 298 "ErrorPage.cshtml"
+#nullable restore
+#line 292 "ErrorPage.cshtml"
                                  if (frame.Line != 0 && frame.ContextCode.Any())
                                 {
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                                    <button class=\"expandCollapseButton\" data-frameId=\"");
-#line 300 "ErrorPage.cshtml"
+#nullable restore
+#line 294 "ErrorPage.cshtml"
                                                                                   Write(frameId);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("\">+</button>\r\n                                    <div class=\"source\">\r\n");
-#line 302 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 302 "ErrorPage.cshtml"
+#nullable restore
+#line 296 "ErrorPage.cshtml"
                                          if (frame.PreContextCode.Any())
                                         {
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                                            <ol");
-            BeginWriteAttribute("start", " start=\"", 7791, "\"", 7820, 1);
-#line 304 "ErrorPage.cshtml"
-WriteAttributeValue("", 7799, frame.PreContextLine, 7799, 21, false);
+            BeginWriteAttribute("start", " start=\"", 7533, "\"", 7562, 1);
+#nullable restore
+#line 298 "ErrorPage.cshtml"
+WriteAttributeValue("", 7541, frame.PreContextLine, 7541, 21, false);
 
 #line default
 #line hidden
+#nullable disable
             EndWriteAttribute();
             WriteLiteral(" class=\"collapsible\">\r\n");
-#line 305 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 305 "ErrorPage.cshtml"
+#nullable restore
+#line 299 "ErrorPage.cshtml"
                                                  foreach (var line in frame.PreContextCode)
                                                 {
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                                                    <li><span>");
-#line 307 "ErrorPage.cshtml"
+#nullable restore
+#line 301 "ErrorPage.cshtml"
                                                          Write(line);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("</span></li>\r\n");
-#line 308 "ErrorPage.cshtml"
+#nullable restore
+#line 302 "ErrorPage.cshtml"
                                                 }
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                                            </ol>\r\n");
-#line 310 "ErrorPage.cshtml"
+#nullable restore
+#line 304 "ErrorPage.cshtml"
                                         }
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("\r\n                                        <ol");
-            BeginWriteAttribute("start", " start=\"", 8259, "\"", 8278, 1);
-#line 312 "ErrorPage.cshtml"
-WriteAttributeValue("", 8267, frame.Line, 8267, 11, false);
+            BeginWriteAttribute("start", " start=\"", 8001, "\"", 8020, 1);
+#nullable restore
+#line 306 "ErrorPage.cshtml"
+WriteAttributeValue("", 8009, frame.Line, 8009, 11, false);
 
 #line default
 #line hidden
+#nullable disable
             EndWriteAttribute();
             WriteLiteral(" class=\"highlight\">\r\n");
-#line 313 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 313 "ErrorPage.cshtml"
+#nullable restore
+#line 307 "ErrorPage.cshtml"
                                              foreach (var line in frame.ContextCode)
                                             {
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                                                <li><span>");
-#line 315 "ErrorPage.cshtml"
+#nullable restore
+#line 309 "ErrorPage.cshtml"
                                                      Write(line);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("</span></li>\r\n");
-#line 316 "ErrorPage.cshtml"
+#nullable restore
+#line 310 "ErrorPage.cshtml"
                                             }
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                                        </ol>\r\n\r\n");
-#line 319 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 319 "ErrorPage.cshtml"
+#nullable restore
+#line 313 "ErrorPage.cshtml"
                                          if (frame.PostContextCode.Any())
                                         {
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                                            <ol");
-            BeginWriteAttribute("start", " start=\'", 8771, "\'", 8796, 1);
-#line 321 "ErrorPage.cshtml"
-WriteAttributeValue("", 8779, frame.Line + 1, 8779, 17, false);
+            BeginWriteAttribute("start", " start=\'", 8513, "\'", 8538, 1);
+#nullable restore
+#line 315 "ErrorPage.cshtml"
+WriteAttributeValue("", 8521, frame.Line + 1, 8521, 17, false);
 
 #line default
 #line hidden
+#nullable disable
             EndWriteAttribute();
             WriteLiteral(" class=\"collapsible\">\r\n");
-#line 322 "ErrorPage.cshtml"
-
-
-#line default
-#line hidden
-
-#line 322 "ErrorPage.cshtml"
+#nullable restore
+#line 316 "ErrorPage.cshtml"
                                                  foreach (var line in frame.PostContextCode)
                                                 {
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                                                    <li><span>");
-#line 324 "ErrorPage.cshtml"
+#nullable restore
+#line 318 "ErrorPage.cshtml"
                                                          Write(line);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("</span></li>\r\n");
-#line 325 "ErrorPage.cshtml"
+#nullable restore
+#line 319 "ErrorPage.cshtml"
                                                 }
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                                            </ol>\r\n");
-#line 327 "ErrorPage.cshtml"
+#nullable restore
+#line 321 "ErrorPage.cshtml"
                                         }
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                                    </div>\r\n");
-#line 329 "ErrorPage.cshtml"
+#nullable restore
+#line 323 "ErrorPage.cshtml"
                                 }
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral("                            </li>\r\n");
-#line 331 "ErrorPage.cshtml"
+#nullable restore
+#line 325 "ErrorPage.cshtml"
                         }
 
 #line default
 #line hidden
-
+#nullable disable
             WriteLiteral(@"                        </ul>
                     </li>
                     <li>
@@ -786,65 +729,96 @@ .page .length {
                         <div class=""rawExceptionBlock"">
                             <div class=""showRawExceptionContainer"">
                                 <button class=""showRawException"" data-exceptionDetailId=""");
-#line 338 "ErrorPage.cshtml"
+#nullable restore
+#line 332 "ErrorPage.cshtml"
                                                                                     Write(exceptionDetailId);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("\">Show raw exception details</button>\r\n                            </div>\r\n                            <div");
-            BeginWriteAttribute("id", " id=\"", 9787, "\"", 9810, 1);
-#line 340 "ErrorPage.cshtml"
-WriteAttributeValue("", 9792, exceptionDetailId, 9792, 18, false);
+            BeginWriteAttribute("id", " id=\"", 9529, "\"", 9552, 1);
+#nullable restore
+#line 334 "ErrorPage.cshtml"
+WriteAttributeValue("", 9534, exceptionDetailId, 9534, 18, false);
 
 #line default
 #line hidden
+#nullable disable
             EndWriteAttribute();
             WriteLiteral(" class=\"rawExceptionDetails\">\r\n                                <pre class=\"rawExceptionStackTrace\">");
-#line 341 "ErrorPage.cshtml"
+#nullable restore
+#line 335 "ErrorPage.cshtml"
                                                                Write(errorDetail.Error.ToString());
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral("</pre>\r\n                            </div>\r\n                        </div>\r\n                    </li>\r\n");
-#line 345 "ErrorPage.cshtml"
+#nullable restore
+#line 339 "ErrorPage.cshtml"
                 }
 
 #line default
 #line hidden
+#nullable disable
+            WriteLiteral("            </ul>\r\n        </div>\r\n");
+#nullable restore
+#line 342 "ErrorPage.cshtml"
+         if (Model.ShowRuntimeDetails) {
 
-            WriteLiteral("            </ul>\r\n        </div>\r\n        <footer>\r\n            ");
-#line 349 "ErrorPage.cshtml"
-       Write(Model.RuntimeDisplayName);
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral("            <footer>\r\n                ");
+#nullable restore
+#line 344 "ErrorPage.cshtml"
+           Write(Model.RuntimeDisplayName);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral(" ");
-#line 349 "ErrorPage.cshtml"
-                                 Write(Model.RuntimeArchitecture);
+#nullable restore
+#line 344 "ErrorPage.cshtml"
+                                     Write(Model.RuntimeArchitecture);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral(" v");
-#line 349 "ErrorPage.cshtml"
-                                                              Write(Model.ClrVersion);
+#nullable restore
+#line 344 "ErrorPage.cshtml"
+                                                                  Write(Model.ClrVersion);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral(" &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;Microsoft.AspNetCore.Hosting version ");
-#line 349 "ErrorPage.cshtml"
-                                                                                                                                                           Write(Model.CurrentAssemblyVesion);
+#nullable restore
+#line 344 "ErrorPage.cshtml"
+                                                                                                                                                               Write(Model.CurrentAssemblyVesion);
 
 #line default
 #line hidden
+#nullable disable
             WriteLiteral(" &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp; ");
-#line 349 "ErrorPage.cshtml"
-                                                                                                                                                                                                                              Write(Model.OperatingSystemDescription);
+#nullable restore
+#line 344 "ErrorPage.cshtml"
+                                                                                                                                                                                                                                  Write(Model.OperatingSystemDescription);
 
 #line default
 #line hidden
-            WriteLiteral(@" &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=""http://go.microsoft.com/fwlink/?LinkId=517394"">Need help?</a>
-        </footer>
-        <script>
+#nullable disable
+            WriteLiteral(" &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href=\"http://go.microsoft.com/fwlink/?LinkId=517394\">Need help?</a>\r\n            </footer>\r\n");
+#nullable restore
+#line 346 "ErrorPage.cshtml"
+        }
+
+#line default
+#line hidden
+#nullable disable
+            WriteLiteral(@"        <script>
             //<!--
             (function (window, undefined) {
     ""use strict"";
@@ -876,11 +850,11 @@ function NodeCollection(selector, element) {
         },
 
         children: function (selector) {
-   ");
-            WriteLiteral(@"         var children = [];
+            var children = [];
 
             this.each(function (el) {
-                children = children.concat(ns(selector, el).items);
+                children = children.concat(ns(selector, el)");
+            WriteLiteral(@".items);
             });
 
             return ns(children);
@@ -916,10 +890,10 @@ function NodeCollection(selector, element) {
                     classNames;
                 if (!existingClassName) {
                     el.className = className;
-             ");
-            WriteLiteral(@"   } else {
+                } else {
                     classNames = existingClassName.split("" "");
-                    if (classNames.indexOf(className) < 0) {
+                    if (classNames.indexOf(className");
+            WriteLiteral(@") < 0) {
                         el.className = existingClassName + "" "" + className;
                     }
                 }
@@ -947,13 +921,13 @@ function NodeCollection(selector, element) {
             return this;
         },
 
-    ");
-            WriteLiteral(@"    attr: function (name) {
+        attr: function (name) {
             if (this.items.length === 0) {
                 return null;
             }
 
-            return this.items[0].getAttribute(name);
+         ");
+            WriteLiteral(@"   return this.items[0].getAttribute(name);
         },
 
         on: function (eventName, handler) {
@@ -979,13 +953,12 @@ function NodeCollection(selector, element) {
         },
 
         click: function (handler) {
-");
-            WriteLiteral(@"
             return this.on(""click"", handler);
         },
 
         keypress: function (handler) {
-            return this.on(""keypress"", handler);
+            return this.on(");
+            WriteLiteral(@"""keypress"", handler);
         }
     };
 
@@ -1018,12 +991,12 @@ function tab(el) {
     ns(""#stackpage"").show();
 
     ns("".expandCollapseButton"")
-        .click(functi");
-            WriteLiteral(@"on () {
+        .click(function () {
             expandCollapseButton(this);
         })
         .keypress(function (e) {
-            if (e.which === 13) {
+            if (e.which === 13) {");
+            WriteLiteral(@"
                 expandCollapseButton(this);
             }
         });
@@ -1051,5 +1024,19 @@ function tab(el) {
 ");
         }
         #pragma warning restore 1998
+#nullable restore
+#line 9 "ErrorPage.cshtml"
+ 
+    public ErrorPage(ErrorPageModel model)
+    {
+        Model = model;
+    }
+
+    public ErrorPageModel Model { get; set; }
+
+#line default
+#line hidden
+#nullable disable
     }
 }
+#pragma warning restore 1591
diff --git a/src/Shared/ErrorPage/ErrorPageModel.cs b/src/Shared/ErrorPage/ErrorPageModel.cs
index 7e0d39f0ded9..cfe53a482ca3 100644
--- a/src/Shared/ErrorPage/ErrorPageModel.cs
+++ b/src/Shared/ErrorPage/ErrorPageModel.cs
@@ -16,6 +16,8 @@ internal class ErrorPageModel
         /// </summary>
         public IEnumerable<ExceptionDetails> ErrorDetails { get; set; }
 
+        public bool ShowRuntimeDetails { get; set; }
+
         public string RuntimeDisplayName { get; set; }
 
         public string RuntimeArchitecture { get; set; }
diff --git a/src/Shared/ErrorPage/GeneratePage.ps1 b/src/Shared/ErrorPage/GeneratePage.ps1
new file mode 100644
index 000000000000..344b424fc20e
--- /dev/null
+++ b/src/Shared/ErrorPage/GeneratePage.ps1
@@ -0,0 +1,18 @@
+param(
+    [Parameter(Mandatory = $true)][string]$ToolingRepoPath
+)
+
+$ToolPath = Join-Path $ToolingRepoPath "artifacts\bin\RazorPageGenerator\Debug\netcoreapp3.0\dotnet-razorpagegenerator.exe"
+
+if (!(Test-Path $ToolPath)) {
+    throw "Unable to find razor page generator tool at $ToolPath"
+}
+
+& "$ToolPath" Microsoft.AspNetCore.Hosting.Views $PSScriptRoot
+
+$TargetPath = Join-Path $PSScriptRoot "ErrorPage.Designer.cs"
+if (Test-Path $TargetPath) {
+    Remove-Item $TargetPath
+}
+
+Move-Item "$PSScriptRoot\Views\ErrorPage.Designer.cs" $PSScriptRoot
\ No newline at end of file
diff --git a/src/Shared/ErrorPage/README.md b/src/Shared/ErrorPage/README.md
new file mode 100644
index 000000000000..1f74a4e33ac2
--- /dev/null
+++ b/src/Shared/ErrorPage/README.md
@@ -0,0 +1,14 @@
+# Error Page
+
+This folder is shared among multiple projects. The `ErrorPage.Designer.cs` and `ErrorPageModel.cs` files are used to render this view. The `ErrorPage.Designer.cs` file is generated by rendering `src/Views/ErrorPage.cshtml` using the [RazorPageGenerator](https://github.com/aspnet/AspNetCore-Tooling/tree/master/src/Razor/src/RazorPageGenerator) tool.
+
+## Making changes to ErrorPage.cshtml
+
+1. Clone aspnet/AspNetCore-Tooling
+1. Run `./build.cmd` in **that repo**
+1. Edit the file
+1. Run the `GeneratePage` script, passing in the path to the `aspnet/AspNetCore-Tooling` repo root.
+
+```
+.\GeneratePage -ToolingRepoPath C:\Code\aspnet\AspNetCore-Tooling
+```
diff --git a/src/Shared/ErrorPage/ErrorPage.cshtml b/src/Shared/ErrorPage/Views/ErrorPage.cshtml
similarity index 86%
rename from src/Shared/ErrorPage/ErrorPage.cshtml
rename to src/Shared/ErrorPage/Views/ErrorPage.cshtml
index d3f9f8d2139d..6eda70931e7f 100644
--- a/src/Shared/ErrorPage/ErrorPage.cshtml
+++ b/src/Shared/ErrorPage/Views/ErrorPage.cshtml
@@ -31,12 +31,11 @@
         @foreach (var errorDetail in Model.ErrorDetails)
         {
             <div class="titleerror">@errorDetail.Error.GetType().Name: @{ Output.Write(HtmlEncodeAndReplaceLineBreaks(errorDetail.Error.Message)); }</div>
-            @{
-                var firstFrame = errorDetail.StackFrames.FirstOrDefault();
-                if (firstFrame != null)
-                {
-                    location = firstFrame.Function;
-                }
+
+            var firstFrame = errorDetail.StackFrames.FirstOrDefault();
+            if (firstFrame != null)
+            {
+                location = firstFrame.Function;
             }
             if (!string.IsNullOrEmpty(location) && firstFrame != null && !string.IsNullOrEmpty(firstFrame.File))
             {
@@ -76,19 +75,15 @@
                 }
                 @foreach (var errorDetail in Model.ErrorDetails)
                 {
-                    @{
-                        exceptionCount++;
-                        exceptionDetailId = "exceptionDetail" + exceptionCount;
-                    }
+                    exceptionCount++;
+                    exceptionDetailId = "exceptionDetail" + exceptionCount;
                     <li>
                         <h2 class="stackerror">@errorDetail.Error.GetType().Name: @errorDetail.Error.Message</h2>
                         <ul>
                         @foreach (var frame in errorDetail.StackFrames)
                         {
-                            @{
-                                stackFrameCount++;
-                                frameId = "frame" + stackFrameCount;
-                            }
+                            stackFrameCount++;
+                            frameId = "frame" + stackFrameCount;
                             <li class="frame" id="@frameId">
                                 @if (string.IsNullOrEmpty(frame.File))
                                 {
@@ -149,9 +144,11 @@
                 }
             </ul>
         </div>
-        <footer>
-            @Model.RuntimeDisplayName @Model.RuntimeArchitecture v@(Model.ClrVersion) &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;Microsoft.AspNetCore.Hosting version @Model.CurrentAssemblyVesion &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp; @Model.OperatingSystemDescription &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href="http://go.microsoft.com/fwlink/?LinkId=517394">Need help?</a>
-        </footer>
+        @if (Model.ShowRuntimeDetails) {
+            <footer>
+                @Model.RuntimeDisplayName @Model.RuntimeArchitecture v@(Model.ClrVersion) &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;Microsoft.AspNetCore.Hosting version @Model.CurrentAssemblyVesion &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp; @Model.OperatingSystemDescription &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;<a href="http://go.microsoft.com/fwlink/?LinkId=517394">Need help?</a>
+            </footer>
+        }
         <script>
             //<!--
             <%$ include: ErrorPage.js %>
diff --git a/src/Shared/ErrorPage/ErrorPage.css b/src/Shared/ErrorPage/Views/ErrorPage.css
similarity index 100%
rename from src/Shared/ErrorPage/ErrorPage.css
rename to src/Shared/ErrorPage/Views/ErrorPage.css
diff --git a/src/Shared/ErrorPage/ErrorPage.js b/src/Shared/ErrorPage/Views/ErrorPage.js
similarity index 100%
rename from src/Shared/ErrorPage/ErrorPage.js
rename to src/Shared/ErrorPage/Views/ErrorPage.js