diff --git a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj
index f9f285c873..c57360b15a 100644
--- a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj
+++ b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj
@@ -75,7 +75,7 @@
 
     <!-- Registration -->
     <BundleRegManufacturer>Microsoft</BundleRegManufacturer>
-    <BundleRegFamily>.NET Core</BundleRegFamily>
+    <BundleRegFamily>.NET</BundleRegFamily>
 
     <DefineConstants>$(DefineConstants);BundleNameShort=$(BundleNameShort)</DefineConstants>
     <DefineConstants>$(DefineConstants);BundleName=$(BundleName)</DefineConstants>
diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
index 9a5513805d..28e7ca2b52 100644
--- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
+++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj
@@ -76,7 +76,7 @@
   <PropertyGroup>
     <PackageFileName>dotnet-hosting-$(PackageVersion)-win$(TargetExt)</PackageFileName>
 
-    <BundleNameShort>Microsoft .NET Core $(PackageBrandingVersion)</BundleNameShort>
+    <BundleNameShort>Microsoft .NET $(PackageBrandingVersion)</BundleNameShort>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -88,8 +88,8 @@
 
     <!-- Registration -->
     <BundleRegManufacturer>Microsoft</BundleRegManufacturer>
-    <BundleRegFamily>.NET Core</BundleRegFamily>
-    <BundleRegName>Microsoft .NET Core $(PackageBrandingVersion) - Windows Server Hosting</BundleRegName>
+    <BundleRegFamily>.NET</BundleRegFamily>
+    <BundleRegName>Microsoft .NET $(PackageBrandingVersion) - Windows Server Hosting</BundleRegName>
     <BundleRegName>$(BundleNameFull)</BundleRegName>
   </PropertyGroup>
 
diff --git a/src/Middleware/tools/RazorPageGenerator/Program.cs b/src/Middleware/tools/RazorPageGenerator/Program.cs
index 60436a46d6..b59be78b88 100644
--- a/src/Middleware/tools/RazorPageGenerator/Program.cs
+++ b/src/Middleware/tools/RazorPageGenerator/Program.cs
@@ -19,12 +19,14 @@ namespace RazorPageGenerator
             {
                 Console.WriteLine("Invalid argument(s).");
                 Console.WriteLine(@"Usage:
-    dotnet razorpagegenerator <root-namespace-of-views> [path]
+    dotnet razorpagegenerator <root-namespace-of-views> [directory path [#line path prefix]]
 Examples:
-    dotnet razorpagegenerator Microsoft.AspNetCore.Diagnostics.RazorViews
-        - processes all views in ""Views"" subfolders of the current directory
-    dotnet razorpagegenerator Microsoft.AspNetCore.Diagnostics.RazorViews c:\project
-        - processes all views in ""Views"" subfolders of c:\project directory
+  dotnet razorpagegenerator Microsoft.AspNetCore.Diagnostics.RazorViews
+    - process all views in ""Views"" subfolders of the current directory; use filename in #line directives
+  dotnet razorpagegenerator Microsoft.AspNetCore.Diagnostics.RazorViews c:\project
+    - process all views in ""Views"" subfolders of c:\project directory; use filename in #line directives
+  dotnet razorpagegenerator Microsoft.AspNetCore.Diagnostics.RazorViews c:\project ../Views/
+    - process all views in ""Views"" subfolders of c:\project directory; use ""../Views/{filename}"" in line directives
 ");
 
                 return 1;
@@ -33,7 +35,9 @@ Examples:
             var rootNamespace = args[0];
             var targetProjectDirectory = args.Length > 1 ? args[1] : Directory.GetCurrentDirectory();
             var projectEngine = CreateProjectEngine(rootNamespace, targetProjectDirectory);
-            var results = MainCore(projectEngine, targetProjectDirectory);
+
+            var physicalPathPrefix = args.Length > 2 ? args[2] : string.Empty;
+            var results = MainCore(projectEngine, targetProjectDirectory, physicalPathPrefix);
 
             foreach (var result in results)
             {
@@ -79,7 +83,10 @@ Examples:
             return projectEngine;
         }
 
-        public static IList<RazorPageGeneratorResult> MainCore(RazorProjectEngine projectEngine, string targetProjectDirectory)
+        public static IList<RazorPageGeneratorResult> MainCore(
+            RazorProjectEngine projectEngine,
+            string targetProjectDirectory,
+            string physicalPathPrefix)
         {
             var viewDirectories = Directory.EnumerateDirectories(targetProjectDirectory, "Views", SearchOption.AllDirectories);
             var fileCount = 0;
@@ -94,14 +101,14 @@ Examples:
 
                 if (!cshtmlFiles.Any())
                 {
-                    Console.WriteLine("  No .cshtml files were found.");
+                    Console.WriteLine("  No .cshtml or .razor files were found.");
                     continue;
                 }
 
                 foreach (var item in cshtmlFiles)
                 {
                     Console.WriteLine("    Generating code file for view {0}...", item.FileName);
-                    results.Add(GenerateCodeFile(projectEngine, item));
+                    results.Add(GenerateCodeFile(projectEngine, item, physicalPathPrefix));
                     Console.WriteLine("      Done!");
                     fileCount++;
                 }
@@ -110,9 +117,12 @@ Examples:
             return results;
         }
 
-        private static RazorPageGeneratorResult GenerateCodeFile(RazorProjectEngine projectEngine, RazorProjectItem projectItem)
+        private static RazorPageGeneratorResult GenerateCodeFile(
+            RazorProjectEngine projectEngine,
+            RazorProjectItem projectItem,
+            string physicalPathPrefix)
         {
-            var projectItemWrapper = new FileSystemRazorProjectItemWrapper(projectItem);
+            var projectItemWrapper = new FileSystemRazorProjectItemWrapper(projectItem, physicalPathPrefix);
             var codeDocument = projectEngine.Process(projectItemWrapper);
             var cSharpDocument = codeDocument.GetCSharpDocument();
             if (cSharpDocument.Diagnostics.Any())
@@ -163,17 +173,19 @@ Examples:
         {
             private readonly RazorProjectItem _source;
 
-            public FileSystemRazorProjectItemWrapper(RazorProjectItem item)
+            public FileSystemRazorProjectItemWrapper(RazorProjectItem item, string physicalPathPrefix)
             {
                 _source = item;
+
+                // Mask the full name since we don't want a developer's local file paths to be committed.
+                PhysicalPath = $"{physicalPathPrefix}{_source.FileName}";
             }
 
             public override string BasePath => _source.BasePath;
 
             public override string FilePath => _source.FilePath;
 
-            // Mask the full name since we don't want a developer's local file paths to be commited.
-            public override string PhysicalPath => _source.FileName;
+            public override string PhysicalPath { get; }
 
             public override bool Exists => _source.Exists;
 
@@ -213,4 +225,4 @@ Examples:
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Shared/ErrorPage/ErrorPage.Designer.cs b/src/Shared/ErrorPage/ErrorPage.Designer.cs
index 402e3ad494..7e92a1fd7f 100644
--- a/src/Shared/ErrorPage/ErrorPage.Designer.cs
+++ b/src/Shared/ErrorPage/ErrorPage.Designer.cs
@@ -5,42 +5,42 @@ namespace Microsoft.AspNetCore.Hosting.Views
     #line hidden
     using System.Threading.Tasks;
 #nullable restore
-#line 1 "ErrorPage.cshtml"
+#line 1 "Views/ErrorPage.cshtml"
 using System;
 
 #line default
 #line hidden
 #nullable disable
 #nullable restore
-#line 2 "ErrorPage.cshtml"
+#line 2 "Views/ErrorPage.cshtml"
 using System.Globalization;
 
 #line default
 #line hidden
 #nullable disable
 #nullable restore
-#line 3 "ErrorPage.cshtml"
+#line 3 "Views/ErrorPage.cshtml"
 using System.Linq;
 
 #line default
 #line hidden
 #nullable disable
 #nullable restore
-#line 4 "ErrorPage.cshtml"
+#line 4 "Views/ErrorPage.cshtml"
 using System.Net;
 
 #line default
 #line hidden
 #nullable disable
 #nullable restore
-#line 5 "ErrorPage.cshtml"
+#line 5 "Views/ErrorPage.cshtml"
 using System.Reflection;
 
 #line default
 #line hidden
 #nullable disable
 #nullable restore
-#line 6 "ErrorPage.cshtml"
+#line 6 "Views/ErrorPage.cshtml"
 using Microsoft.AspNetCore.Hosting.Views;
 
 #line default
@@ -53,7 +53,7 @@ using Microsoft.AspNetCore.Hosting.Views;
         {
             WriteLiteral("\r\n");
 #nullable restore
-#line 17 "ErrorPage.cshtml"
+#line 17 "Views/ErrorPage.cshtml"
   
     var location = string.Empty;
 
@@ -63,7 +63,7 @@ using Microsoft.AspNetCore.Hosting.Views;
             WriteLiteral("<!DOCTYPE html>\r\n<html");
             BeginWriteAttribute("lang", " lang=\"", 366, "\"", 427, 1);
 #nullable restore
-#line 21 "ErrorPage.cshtml"
+#line 21 "Views/ErrorPage.cshtml"
 WriteAttributeValue("", 373, CultureInfo.CurrentUICulture.TwoLetterISOLanguageName, 373, 54, false);
 
 #line default
@@ -176,16 +176,22 @@ body .location {
         background-color: #fbfbfb;
     }
 
+#stackpage .frame .source .highlight {
+    border-left: 3px solid red;
+    margin-left: -3px;
+    font-weight: bold;
+}
+
 #stackpage .frame .source .highlight li span {
-    color: #FF0000;
+    co");
+            WriteLiteral(@"lor: #FF0000;
 }
 
 #stackpage .source ol.collapsible li {
     color: #888;
 }
 
-    #stackpage .source ol.collapsible li sp");
-            WriteLiteral(@"an {
+    #stackpage .source ol.collapsible li span {
         color: #606060;
     }
 
@@ -236,12 +242,12 @@ a {
 .showRawException {
     cursor: pointer;
     color: #44c5f2;
-    background-color: transparent;
+    bac");
+            WriteLiteral(@"kground-color: transparent;
     font-size: 1.2em;
     text-align: left;
     text-decoration: none;
-    display: inline-blo");
-            WriteLiteral(@"ck;
+    display: inline-block;
     border: 0;
     padding: 0;
 }
@@ -280,7 +286,7 @@ a {
         <h1>An error occurred while starting the application.</h1>
 ");
 #nullable restore
-#line 226 "ErrorPage.cshtml"
+#line 232 "Views/ErrorPage.cshtml"
          foreach (var errorDetail in Model.ErrorDetails)
         {
 
@@ -289,7 +295,7 @@ a {
 #nullable disable
             WriteLiteral("            <div class=\"titleerror\">");
 #nullable restore
-#line 228 "ErrorPage.cshtml"
+#line 234 "Views/ErrorPage.cshtml"
                                Write(errorDetail.Error.GetType().Name);
 
 #line default
@@ -297,7 +303,7 @@ a {
 #nullable disable
             WriteLiteral(": ");
 #nullable restore
-#line 228 "ErrorPage.cshtml"
+#line 234 "Views/ErrorPage.cshtml"
                                                                           Output.Write(HtmlEncodeAndReplaceLineBreaks(errorDetail.Error.Message)); 
 
 #line default
@@ -305,7 +311,7 @@ a {
 #nullable disable
             WriteLiteral("</div>\r\n");
 #nullable restore
-#line 229 "ErrorPage.cshtml"
+#line 235 "Views/ErrorPage.cshtml"
 
             var firstFrame = errorDetail.StackFrames.FirstOrDefault();
             if (firstFrame != null)
@@ -320,17 +326,17 @@ a {
 #nullable disable
             WriteLiteral("                <p class=\"location\">");
 #nullable restore
-#line 237 "ErrorPage.cshtml"
+#line 243 "Views/ErrorPage.cshtml"
                                Write(location);
 
 #line default
 #line hidden
 #nullable disable
             WriteLiteral(" in <code");
-            BeginWriteAttribute("title", " title=\"", 4736, "\"", 4760, 1);
+            BeginWriteAttribute("title", " title=\"", 4862, "\"", 4886, 1);
 #nullable restore
-#line 237 "ErrorPage.cshtml"
-WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
+#line 243 "Views/ErrorPage.cshtml"
+WriteAttributeValue("", 4870, firstFrame.File, 4870, 16, false);
 
 #line default
 #line hidden
@@ -338,7 +344,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
             EndWriteAttribute();
             WriteLiteral(">");
 #nullable restore
-#line 237 "ErrorPage.cshtml"
+#line 243 "Views/ErrorPage.cshtml"
                                                                            Write(System.IO.Path.GetFileName(firstFrame.File));
 
 #line default
@@ -346,7 +352,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #nullable disable
             WriteLiteral("</code>, line ");
 #nullable restore
-#line 237 "ErrorPage.cshtml"
+#line 243 "Views/ErrorPage.cshtml"
                                                                                                                                      Write(firstFrame.Line);
 
 #line default
@@ -354,7 +360,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #nullable disable
             WriteLiteral("</p>\r\n");
 #nullable restore
-#line 238 "ErrorPage.cshtml"
+#line 244 "Views/ErrorPage.cshtml"
             }
             else if (!string.IsNullOrEmpty(location))
             {
@@ -364,7 +370,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #nullable disable
             WriteLiteral("                <p class=\"location\">");
 #nullable restore
-#line 241 "ErrorPage.cshtml"
+#line 247 "Views/ErrorPage.cshtml"
                                Write(location);
 
 #line default
@@ -372,7 +378,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #nullable disable
             WriteLiteral("</p>\r\n");
 #nullable restore
-#line 242 "ErrorPage.cshtml"
+#line 248 "Views/ErrorPage.cshtml"
             }
             else
             {
@@ -382,7 +388,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #nullable disable
             WriteLiteral("                <p class=\"location\">Unknown location</p>\r\n");
 #nullable restore
-#line 246 "ErrorPage.cshtml"
+#line 252 "Views/ErrorPage.cshtml"
             }
 
             var reflectionTypeLoadException = errorDetail.Error as ReflectionTypeLoadException;
@@ -396,7 +402,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #nullable disable
             WriteLiteral("                    <h3>Loader Exceptions:</h3>\r\n                    <ul>\r\n");
 #nullable restore
-#line 255 "ErrorPage.cshtml"
+#line 261 "Views/ErrorPage.cshtml"
                          foreach (var ex in reflectionTypeLoadException.LoaderExceptions)
                         {
 
@@ -405,7 +411,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #nullable disable
             WriteLiteral("                            <li>");
 #nullable restore
-#line 257 "ErrorPage.cshtml"
+#line 263 "Views/ErrorPage.cshtml"
                            Write(ex.Message);
 
 #line default
@@ -413,7 +419,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #nullable disable
             WriteLiteral("</li>\r\n");
 #nullable restore
-#line 258 "ErrorPage.cshtml"
+#line 264 "Views/ErrorPage.cshtml"
                         }
 
 #line default
@@ -421,7 +427,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #nullable disable
             WriteLiteral("                    </ul>\r\n");
 #nullable restore
-#line 260 "ErrorPage.cshtml"
+#line 266 "Views/ErrorPage.cshtml"
                 }
             }
         }
@@ -431,7 +437,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #nullable disable
             WriteLiteral("        <div id=\"stackpage\" class=\"page\">\r\n            <ul>\r\n");
 #nullable restore
-#line 265 "ErrorPage.cshtml"
+#line 271 "Views/ErrorPage.cshtml"
                   
                     var exceptionCount = 0;
                     var stackFrameCount = 0;
@@ -443,7 +449,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #line hidden
 #nullable disable
 #nullable restore
-#line 271 "ErrorPage.cshtml"
+#line 277 "Views/ErrorPage.cshtml"
                  foreach (var errorDetail in Model.ErrorDetails)
                 {
                     exceptionCount++;
@@ -454,7 +460,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #nullable disable
             WriteLiteral("                    <li>\r\n                        <h2 class=\"stackerror\">");
 #nullable restore
-#line 276 "ErrorPage.cshtml"
+#line 282 "Views/ErrorPage.cshtml"
                                           Write(errorDetail.Error.GetType().Name);
 
 #line default
@@ -462,7 +468,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #nullable disable
             WriteLiteral(": ");
 #nullable restore
-#line 276 "ErrorPage.cshtml"
+#line 282 "Views/ErrorPage.cshtml"
                                                                              Write(errorDetail.Error.Message);
 
 #line default
@@ -470,7 +476,7 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #nullable disable
             WriteLiteral("</h2>\r\n                        <ul>\r\n");
 #nullable restore
-#line 278 "ErrorPage.cshtml"
+#line 284 "Views/ErrorPage.cshtml"
                          foreach (var frame in errorDetail.StackFrames)
                         {
                             stackFrameCount++;
@@ -480,10 +486,10 @@ WriteAttributeValue("", 4744, firstFrame.File, 4744, 16, false);
 #line hidden
 #nullable disable
             WriteLiteral("                            <li class=\"frame\"");
-            BeginWriteAttribute("id", " id=\"", 6616, "\"", 6629, 1);
+            BeginWriteAttribute("id", " id=\"", 6742, "\"", 6755, 1);
 #nullable restore
-#line 282 "ErrorPage.cshtml"
-WriteAttributeValue("", 6621, frameId, 6621, 8, false);
+#line 288 "Views/ErrorPage.cshtml"
+WriteAttributeValue("", 6747, frameId, 6747, 8, false);
 
 #line default
 #line hidden
@@ -491,7 +497,7 @@ WriteAttributeValue("", 6621, frameId, 6621, 8, false);
             EndWriteAttribute();
             WriteLiteral(">\r\n");
 #nullable restore
-#line 283 "ErrorPage.cshtml"
+#line 289 "Views/ErrorPage.cshtml"
                                  if (string.IsNullOrEmpty(frame.File))
                                 {
 
@@ -500,7 +506,7 @@ WriteAttributeValue("", 6621, frameId, 6621, 8, false);
 #nullable disable
             WriteLiteral("                                    <h3>");
 #nullable restore
-#line 285 "ErrorPage.cshtml"
+#line 291 "Views/ErrorPage.cshtml"
                                    Write(frame.Function);
 
 #line default
@@ -508,7 +514,7 @@ WriteAttributeValue("", 6621, frameId, 6621, 8, false);
 #nullable disable
             WriteLiteral("</h3>\r\n");
 #nullable restore
-#line 286 "ErrorPage.cshtml"
+#line 292 "Views/ErrorPage.cshtml"
                                 }
                                 else
                                 {
@@ -518,17 +524,17 @@ WriteAttributeValue("", 6621, frameId, 6621, 8, false);
 #nullable disable
             WriteLiteral("                                    <h3>");
 #nullable restore
-#line 289 "ErrorPage.cshtml"
+#line 295 "Views/ErrorPage.cshtml"
                                    Write(frame.Function);
 
 #line default
 #line hidden
 #nullable disable
             WriteLiteral(" in <code");
-            BeginWriteAttribute("title", " title=\"", 6974, "\"", 6993, 1);
+            BeginWriteAttribute("title", " title=\"", 7100, "\"", 7119, 1);
 #nullable restore
-#line 289 "ErrorPage.cshtml"
-WriteAttributeValue("", 6982, frame.File, 6982, 11, false);
+#line 295 "Views/ErrorPage.cshtml"
+WriteAttributeValue("", 7108, frame.File, 7108, 11, false);
 
 #line default
 #line hidden
@@ -536,7 +542,7 @@ WriteAttributeValue("", 6982, frame.File, 6982, 11, false);
             EndWriteAttribute();
             WriteLiteral(">");
 #nullable restore
-#line 289 "ErrorPage.cshtml"
+#line 295 "Views/ErrorPage.cshtml"
                                                                                 Write(System.IO.Path.GetFileName(frame.File));
 
 #line default
@@ -544,7 +550,7 @@ WriteAttributeValue("", 6982, frame.File, 6982, 11, false);
 #nullable disable
             WriteLiteral("</code></h3>\r\n");
 #nullable restore
-#line 290 "ErrorPage.cshtml"
+#line 296 "Views/ErrorPage.cshtml"
                                 }
 
 #line default
@@ -552,7 +558,7 @@ WriteAttributeValue("", 6982, frame.File, 6982, 11, false);
 #nullable disable
             WriteLiteral("\r\n");
 #nullable restore
-#line 292 "ErrorPage.cshtml"
+#line 298 "Views/ErrorPage.cshtml"
                                  if (frame.Line != 0 && frame.ContextCode.Any())
                                 {
 
@@ -561,7 +567,7 @@ WriteAttributeValue("", 6982, frame.File, 6982, 11, false);
 #nullable disable
             WriteLiteral("                                    <button class=\"expandCollapseButton\" data-frameId=\"");
 #nullable restore
-#line 294 "ErrorPage.cshtml"
+#line 300 "Views/ErrorPage.cshtml"
                                                                                   Write(frameId);
 
 #line default
@@ -569,7 +575,7 @@ WriteAttributeValue("", 6982, frame.File, 6982, 11, false);
 #nullable disable
             WriteLiteral("\">+</button>\r\n                                    <div class=\"source\">\r\n");
 #nullable restore
-#line 296 "ErrorPage.cshtml"
+#line 302 "Views/ErrorPage.cshtml"
                                          if (frame.PreContextCode.Any())
                                         {
 
@@ -577,10 +583,10 @@ WriteAttributeValue("", 6982, frame.File, 6982, 11, false);
 #line hidden
 #nullable disable
             WriteLiteral("                                            <ol");
-            BeginWriteAttribute("start", " start=\"", 7533, "\"", 7562, 1);
+            BeginWriteAttribute("start", " start=\"", 7659, "\"", 7688, 1);
 #nullable restore
-#line 298 "ErrorPage.cshtml"
-WriteAttributeValue("", 7541, frame.PreContextLine, 7541, 21, false);
+#line 304 "Views/ErrorPage.cshtml"
+WriteAttributeValue("", 7667, frame.PreContextLine, 7667, 21, false);
 
 #line default
 #line hidden
@@ -588,7 +594,7 @@ WriteAttributeValue("", 7541, frame.PreContextLine, 7541, 21, false);
             EndWriteAttribute();
             WriteLiteral(" class=\"collapsible\">\r\n");
 #nullable restore
-#line 299 "ErrorPage.cshtml"
+#line 305 "Views/ErrorPage.cshtml"
                                                  foreach (var line in frame.PreContextCode)
                                                 {
 
@@ -597,7 +603,7 @@ WriteAttributeValue("", 7541, frame.PreContextLine, 7541, 21, false);
 #nullable disable
             WriteLiteral("                                                    <li><span>");
 #nullable restore
-#line 301 "ErrorPage.cshtml"
+#line 307 "Views/ErrorPage.cshtml"
                                                          Write(line);
 
 #line default
@@ -605,7 +611,7 @@ WriteAttributeValue("", 7541, frame.PreContextLine, 7541, 21, false);
 #nullable disable
             WriteLiteral("</span></li>\r\n");
 #nullable restore
-#line 302 "ErrorPage.cshtml"
+#line 308 "Views/ErrorPage.cshtml"
                                                 }
 
 #line default
@@ -613,17 +619,17 @@ WriteAttributeValue("", 7541, frame.PreContextLine, 7541, 21, false);
 #nullable disable
             WriteLiteral("                                            </ol>\r\n");
 #nullable restore
-#line 304 "ErrorPage.cshtml"
+#line 310 "Views/ErrorPage.cshtml"
                                         }
 
 #line default
 #line hidden
 #nullable disable
             WriteLiteral("\r\n                                        <ol");
-            BeginWriteAttribute("start", " start=\"", 8001, "\"", 8020, 1);
+            BeginWriteAttribute("start", " start=\"", 8127, "\"", 8146, 1);
 #nullable restore
-#line 306 "ErrorPage.cshtml"
-WriteAttributeValue("", 8009, frame.Line, 8009, 11, false);
+#line 312 "Views/ErrorPage.cshtml"
+WriteAttributeValue("", 8135, frame.Line, 8135, 11, false);
 
 #line default
 #line hidden
@@ -631,7 +637,7 @@ WriteAttributeValue("", 8009, frame.Line, 8009, 11, false);
             EndWriteAttribute();
             WriteLiteral(" class=\"highlight\">\r\n");
 #nullable restore
-#line 307 "ErrorPage.cshtml"
+#line 313 "Views/ErrorPage.cshtml"
                                              foreach (var line in frame.ContextCode)
                                             {
 
@@ -640,7 +646,7 @@ WriteAttributeValue("", 8009, frame.Line, 8009, 11, false);
 #nullable disable
             WriteLiteral("                                                <li><span>");
 #nullable restore
-#line 309 "ErrorPage.cshtml"
+#line 315 "Views/ErrorPage.cshtml"
                                                      Write(line);
 
 #line default
@@ -648,7 +654,7 @@ WriteAttributeValue("", 8009, frame.Line, 8009, 11, false);
 #nullable disable
             WriteLiteral("</span></li>\r\n");
 #nullable restore
-#line 310 "ErrorPage.cshtml"
+#line 316 "Views/ErrorPage.cshtml"
                                             }
 
 #line default
@@ -656,7 +662,7 @@ WriteAttributeValue("", 8009, frame.Line, 8009, 11, false);
 #nullable disable
             WriteLiteral("                                        </ol>\r\n\r\n");
 #nullable restore
-#line 313 "ErrorPage.cshtml"
+#line 319 "Views/ErrorPage.cshtml"
                                          if (frame.PostContextCode.Any())
                                         {
 
@@ -664,10 +670,10 @@ WriteAttributeValue("", 8009, frame.Line, 8009, 11, false);
 #line hidden
 #nullable disable
             WriteLiteral("                                            <ol");
-            BeginWriteAttribute("start", " start=\'", 8513, "\'", 8538, 1);
+            BeginWriteAttribute("start", " start=\'", 8639, "\'", 8664, 1);
 #nullable restore
-#line 315 "ErrorPage.cshtml"
-WriteAttributeValue("", 8521, frame.Line + 1, 8521, 17, false);
+#line 321 "Views/ErrorPage.cshtml"
+WriteAttributeValue("", 8647, frame.Line + 1, 8647, 17, false);
 
 #line default
 #line hidden
@@ -675,7 +681,7 @@ WriteAttributeValue("", 8521, frame.Line + 1, 8521, 17, false);
             EndWriteAttribute();
             WriteLiteral(" class=\"collapsible\">\r\n");
 #nullable restore
-#line 316 "ErrorPage.cshtml"
+#line 322 "Views/ErrorPage.cshtml"
                                                  foreach (var line in frame.PostContextCode)
                                                 {
 
@@ -684,7 +690,7 @@ WriteAttributeValue("", 8521, frame.Line + 1, 8521, 17, false);
 #nullable disable
             WriteLiteral("                                                    <li><span>");
 #nullable restore
-#line 318 "ErrorPage.cshtml"
+#line 324 "Views/ErrorPage.cshtml"
                                                          Write(line);
 
 #line default
@@ -692,7 +698,7 @@ WriteAttributeValue("", 8521, frame.Line + 1, 8521, 17, false);
 #nullable disable
             WriteLiteral("</span></li>\r\n");
 #nullable restore
-#line 319 "ErrorPage.cshtml"
+#line 325 "Views/ErrorPage.cshtml"
                                                 }
 
 #line default
@@ -700,7 +706,7 @@ WriteAttributeValue("", 8521, frame.Line + 1, 8521, 17, false);
 #nullable disable
             WriteLiteral("                                            </ol>\r\n");
 #nullable restore
-#line 321 "ErrorPage.cshtml"
+#line 327 "Views/ErrorPage.cshtml"
                                         }
 
 #line default
@@ -708,7 +714,7 @@ WriteAttributeValue("", 8521, frame.Line + 1, 8521, 17, false);
 #nullable disable
             WriteLiteral("                                    </div>\r\n");
 #nullable restore
-#line 323 "ErrorPage.cshtml"
+#line 329 "Views/ErrorPage.cshtml"
                                 }
 
 #line default
@@ -716,7 +722,7 @@ WriteAttributeValue("", 8521, frame.Line + 1, 8521, 17, false);
 #nullable disable
             WriteLiteral("                            </li>\r\n");
 #nullable restore
-#line 325 "ErrorPage.cshtml"
+#line 331 "Views/ErrorPage.cshtml"
                         }
 
 #line default
@@ -730,17 +736,17 @@ WriteAttributeValue("", 8521, frame.Line + 1, 8521, 17, false);
                             <div class=""showRawExceptionContainer"">
                                 <button class=""showRawException"" data-exceptionDetailId=""");
 #nullable restore
-#line 332 "ErrorPage.cshtml"
+#line 338 "Views/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=\"", 9529, "\"", 9552, 1);
+            BeginWriteAttribute("id", " id=\"", 9655, "\"", 9678, 1);
 #nullable restore
-#line 334 "ErrorPage.cshtml"
-WriteAttributeValue("", 9534, exceptionDetailId, 9534, 18, false);
+#line 340 "Views/ErrorPage.cshtml"
+WriteAttributeValue("", 9660, exceptionDetailId, 9660, 18, false);
 
 #line default
 #line hidden
@@ -748,7 +754,7 @@ WriteAttributeValue("", 9534, exceptionDetailId, 9534, 18, false);
             EndWriteAttribute();
             WriteLiteral(" class=\"rawExceptionDetails\">\r\n                                <pre class=\"rawExceptionStackTrace\">");
 #nullable restore
-#line 335 "ErrorPage.cshtml"
+#line 341 "Views/ErrorPage.cshtml"
                                                                Write(errorDetail.Error.ToString());
 
 #line default
@@ -756,7 +762,7 @@ WriteAttributeValue("", 9534, exceptionDetailId, 9534, 18, false);
 #nullable disable
             WriteLiteral("</pre>\r\n                            </div>\r\n                        </div>\r\n                    </li>\r\n");
 #nullable restore
-#line 339 "ErrorPage.cshtml"
+#line 345 "Views/ErrorPage.cshtml"
                 }
 
 #line default
@@ -764,7 +770,7 @@ WriteAttributeValue("", 9534, exceptionDetailId, 9534, 18, false);
 #nullable disable
             WriteLiteral("            </ul>\r\n        </div>\r\n");
 #nullable restore
-#line 342 "ErrorPage.cshtml"
+#line 348 "Views/ErrorPage.cshtml"
          if (Model.ShowRuntimeDetails) {
 
 #line default
@@ -772,7 +778,7 @@ WriteAttributeValue("", 9534, exceptionDetailId, 9534, 18, false);
 #nullable disable
             WriteLiteral("            <footer>\r\n                ");
 #nullable restore
-#line 344 "ErrorPage.cshtml"
+#line 350 "Views/ErrorPage.cshtml"
            Write(Model.RuntimeDisplayName);
 
 #line default
@@ -780,7 +786,7 @@ WriteAttributeValue("", 9534, exceptionDetailId, 9534, 18, false);
 #nullable disable
             WriteLiteral(" ");
 #nullable restore
-#line 344 "ErrorPage.cshtml"
+#line 350 "Views/ErrorPage.cshtml"
                                      Write(Model.RuntimeArchitecture);
 
 #line default
@@ -788,7 +794,7 @@ WriteAttributeValue("", 9534, exceptionDetailId, 9534, 18, false);
 #nullable disable
             WriteLiteral(" v");
 #nullable restore
-#line 344 "ErrorPage.cshtml"
+#line 350 "Views/ErrorPage.cshtml"
                                                                   Write(Model.ClrVersion);
 
 #line default
@@ -796,7 +802,7 @@ WriteAttributeValue("", 9534, exceptionDetailId, 9534, 18, false);
 #nullable disable
             WriteLiteral(" &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp;Microsoft.AspNetCore.Hosting version ");
 #nullable restore
-#line 344 "ErrorPage.cshtml"
+#line 350 "Views/ErrorPage.cshtml"
                                                                                                                                                                Write(Model.CurrentAssemblyVesion);
 
 #line default
@@ -804,7 +810,7 @@ WriteAttributeValue("", 9534, exceptionDetailId, 9534, 18, false);
 #nullable disable
             WriteLiteral(" &nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;&nbsp; ");
 #nullable restore
-#line 344 "ErrorPage.cshtml"
+#line 350 "Views/ErrorPage.cshtml"
                                                                                                                                                                                                                                   Write(Model.OperatingSystemDescription);
 
 #line default
@@ -812,7 +818,7 @@ WriteAttributeValue("", 9534, exceptionDetailId, 9534, 18, false);
 #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 352 "Views/ErrorPage.cshtml"
         }
 
 #line default
@@ -1025,7 +1031,7 @@ WriteAttributeValue("", 9534, exceptionDetailId, 9534, 18, false);
         }
         #pragma warning restore 1998
 #nullable restore
-#line 9 "ErrorPage.cshtml"
+#line 9 "Views/ErrorPage.cshtml"
  
     public ErrorPage(ErrorPageModel model)
     {
diff --git a/src/Shared/ErrorPage/GeneratePage.ps1 b/src/Shared/ErrorPage/GeneratePage.ps1
index f1c9175ea4..0a2b040305 100644
--- a/src/Shared/ErrorPage/GeneratePage.ps1
+++ b/src/Shared/ErrorPage/GeneratePage.ps1
@@ -1,18 +1,15 @@
-param(
-    [Parameter(Mandatory = $true)][string]$ToolingRepoPath
-)
+$RepoRoot = Resolve-Path "$PSScriptRoot\..\..\.."
+$ToolPath = Join-Path "$RepoRoot" "artifacts\bin\RazorPageGenerator\Debug\net5.0\dotnet-razorpagegenerator.exe"
 
-$ToolPath = Join-Path $ToolingRepoPath "artifacts\bin\RazorPageGenerator\Debug\net5.0\dotnet-razorpagegenerator.exe"
-
-if (!(Test-Path $ToolPath)) {
+if (!(Test-Path "$ToolPath")) {
     throw "Unable to find razor page generator tool at $ToolPath"
 }
 
-& "$ToolPath" Microsoft.AspNetCore.Hosting.Views $PSScriptRoot
+& "$ToolPath" Microsoft.AspNetCore.Hosting.Views "$PSScriptRoot" Views/
 
-$TargetPath = Join-Path $PSScriptRoot "ErrorPage.Designer.cs"
-if (Test-Path $TargetPath) {
-    Remove-Item $TargetPath
+$TargetPath = Join-Path "$PSScriptRoot" "ErrorPage.Designer.cs"
+if (Test-Path "$TargetPath") {
+    Remove-Item "$TargetPath"
 }
 
-Move-Item "$PSScriptRoot\Views\ErrorPage.Designer.cs" $PSScriptRoot
+Move-Item "$PSScriptRoot\Views\ErrorPage.Designer.cs" "$PSScriptRoot"
diff --git a/src/Shared/ErrorPage/README.md b/src/Shared/ErrorPage/README.md
index cc0dbc377c..e6d141172f 100644
--- a/src/Shared/ErrorPage/README.md
+++ b/src/Shared/ErrorPage/README.md
@@ -1,14 +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/dotnet/aspnetcore-tooling/tree/master/src/Razor/src/RazorPageGenerator) tool.
+Multiple projects share this folder. The `ErrorPage.Designer.cs` and `ErrorPageModel.cs` files render this shared
+view. The [RazorPageGenerator](/src/Razor/tools/RazorSyntaxGenerator/) tool generates the `ErrorPage.Designer.cs`
+file from [`Views/ErrorPage.cshtml`](Views/ErrorPage.cshtml).
 
 ## Making changes to ErrorPage.cshtml
 
-1. Clone dotnet/aspnetcore-tooling
-1. Run `./build.cmd` in **that repo**
-1. Edit the file
-1. Run the `GeneratePage` script, passing in the path to the `dotnet/aspnetcore-tooling` repo root.
+1. Edit the [`Views/ErrorPage.cshtml`](Views/ErrorPage.cshtml) file.
+1. Run the [`GeneratePage`](GeneratePage.ps1) script.
 
-```
-.\GeneratePage -ToolingRepoPath C:\Code\aspnet\AspNetCore-Tooling
+``` powershell
+.\GeneratePage.ps1
 ```