diff --git a/.editorconfig b/.editorconfig
index 00aaa787e7..b1debc81f7 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -35,3 +35,6 @@ indent_size = 4
 [*.sh]
 indent_size = 4
 end_of_line = lf
+
+[*.{razor,cshtml}]
+charset = utf-8-bom
diff --git a/global.json b/global.json
index d3fad315e5..26221c3cd3 100644
--- a/global.json
+++ b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "5.0.100-preview.6.20310.4"
+    "version": "5.0.100-preview.7.20330.3"
   },
   "tools": {
-    "dotnet": "5.0.100-preview.6.20310.4",
+    "dotnet": "5.0.100-preview.7.20330.3",
     "runtimes": {
       "dotnet/x64": [
         "2.1.18",
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml
index 487effa8c1..591045d3cd 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/AccessDenied.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model AccessDeniedModel
 @{
     ViewData["Title"] = "Access denied";
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml
index 30e569ead1..173f083425 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/Error.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ErrorModel
 @{
     ViewData["Title"] = "Error";
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml
index ef41507d5b..92ede3a145 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/SignedOut.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model SignedOutModel
 @{
     ViewData["Title"] = "Signed out";
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/_viewImports.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/_viewImports.cshtml
index 8f74cb9c22..69cc620e98 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/_viewImports.cshtml
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/Account/_viewImports.cshtml
@@ -1,2 +1,2 @@
-@using Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal
+@using Microsoft.AspNetCore.Authentication.AzureAD.UI.Internal
 @namespace Microsoft.AspNetCore.Authentication.AzureAD.UI.Pages.Internal
\ No newline at end of file
diff --git a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/_ViewStart.cshtml b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/_ViewStart.cshtml
index 6b488b0592..c51721cd40 100644
--- a/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/_ViewStart.cshtml
+++ b/src/Azure/AzureAD/Authentication.AzureAD.UI/src/Areas/AzureAD/Pages/_ViewStart.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Hosting
+@using Microsoft.AspNetCore.Hosting
 @using Microsoft.AspNetCore.Mvc.ViewEngines
 
 @inject IWebHostEnvironment Environment
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml
index ac4c026e2f..2084bbf67a 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/AccessDenied.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model AccessDeniedModel
 @{
     ViewData["Title"] = "Access denied";
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml
index 60da74a372..046fdddb56 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/Error.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ErrorModel
 @{
     ViewData["Title"] = "Error";
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml
index b29fbad79c..13e90c4216 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/SignedOut.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model SignedOutModel
 @{
     ViewData["Title"] = "Signed out";
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml
index fdcfe574d0..655317c358 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/Account/_viewImports.cshtml
@@ -1,2 +1,2 @@
-@using Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal
+@using Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Internal
 @namespace Microsoft.AspNetCore.Authentication.AzureADB2C.UI.Pages.Internal
\ No newline at end of file
diff --git a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/_ViewStart.cshtml b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/_ViewStart.cshtml
index 6b488b0592..c51721cd40 100644
--- a/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/_ViewStart.cshtml
+++ b/src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Areas/AzureADB2C/Pages/_ViewStart.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Hosting
+@using Microsoft.AspNetCore.Hosting
 @using Microsoft.AspNetCore.Mvc.ViewEngines
 
 @inject IWebHostEnvironment Environment
diff --git a/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/About.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/About.cshtml
index 15054f57f1..43c5750248 100644
--- a/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/About.cshtml
+++ b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/About.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model AzureADB2CSample.Pages.AboutModel
 @{
 }
diff --git a/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml
index 29064539bb..44a7323c75 100644
--- a/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml
+++ b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Index.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model IndexModel
 @{
     ViewData["Title"] = "Home page";
diff --git a/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml
index a40eccbe1d..f2636c44a9 100644
--- a/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml
+++ b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/Shared/_LoginPartial.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Authentication.AzureADB2C.UI
+@using Microsoft.AspNetCore.Authentication.AzureADB2C.UI
 @using Microsoft.Extensions.Options
 @inject IOptionsMonitor<AzureADB2COptions> AzureADB2COptions
 @{ 
diff --git a/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewImports.cshtml b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewImports.cshtml
index 4610d17e9b..c5c2887c3c 100644
--- a/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewImports.cshtml
+++ b/src/Azure/AzureAD/samples/AzureADB2CSample/Pages/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@namespace AzureADB2CSample.Pages
+@namespace AzureADB2CSample.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Azure/AzureAD/samples/AzureADSample/Pages/Index.cshtml b/src/Azure/AzureAD/samples/AzureADSample/Pages/Index.cshtml
index 29064539bb..44a7323c75 100644
--- a/src/Azure/AzureAD/samples/AzureADSample/Pages/Index.cshtml
+++ b/src/Azure/AzureAD/samples/AzureADSample/Pages/Index.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model IndexModel
 @{
     ViewData["Title"] = "Home page";
diff --git a/src/Azure/AzureAD/samples/AzureADSample/Pages/Shared/_Layout.cshtml b/src/Azure/AzureAD/samples/AzureADSample/Pages/Shared/_Layout.cshtml
index d30242ee4e..00bd0fa8c5 100644
--- a/src/Azure/AzureAD/samples/AzureADSample/Pages/Shared/_Layout.cshtml
+++ b/src/Azure/AzureAD/samples/AzureADSample/Pages/Shared/_Layout.cshtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8" />
diff --git a/src/Azure/AzureAD/samples/AzureADSample/Pages/Shared/_LoginPartial.cshtml b/src/Azure/AzureAD/samples/AzureADSample/Pages/Shared/_LoginPartial.cshtml
index c45e1e4230..dfecec8c74 100644
--- a/src/Azure/AzureAD/samples/AzureADSample/Pages/Shared/_LoginPartial.cshtml
+++ b/src/Azure/AzureAD/samples/AzureADSample/Pages/Shared/_LoginPartial.cshtml
@@ -1,4 +1,4 @@
-@if (User.Identity.IsAuthenticated)
+@if (User.Identity.IsAuthenticated)
 {
     <ul class="nav navbar-nav navbar-right">
         <li class="navbar-text">Hello @User.Identity.Name!</li>
diff --git a/src/Azure/AzureAD/samples/AzureADSample/Pages/_ViewImports.cshtml b/src/Azure/AzureAD/samples/AzureADSample/Pages/_ViewImports.cshtml
index 0d6b19f01b..a20eef1959 100644
--- a/src/Azure/AzureAD/samples/AzureADSample/Pages/_ViewImports.cshtml
+++ b/src/Azure/AzureAD/samples/AzureADSample/Pages/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@namespace AzureADSample.Pages
+@namespace AzureADSample.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Components/Authorization/src/CascadingAuthenticationState.razor b/src/Components/Authorization/src/CascadingAuthenticationState.razor
index 87506d2c61..26c670a335 100644
--- a/src/Components/Authorization/src/CascadingAuthenticationState.razor
+++ b/src/Components/Authorization/src/CascadingAuthenticationState.razor
@@ -1,4 +1,4 @@
-@implements IDisposable
+@implements IDisposable
 @inject AuthenticationStateProvider AuthenticationStateProvider
 
 <CascadingValue TValue="Task<AuthenticationState>" Value="@_currentAuthenticationStateTask" ChildContent="@ChildContent" />
diff --git a/src/Components/Samples/BlazorServerApp/Pages/Index.razor b/src/Components/Samples/BlazorServerApp/Pages/Index.razor
index e6a33ccd43..16dac31925 100644
--- a/src/Components/Samples/BlazorServerApp/Pages/Index.razor
+++ b/src/Components/Samples/BlazorServerApp/Pages/Index.razor
@@ -1,4 +1,4 @@
-@page "/"
+@page "/"
 
 <h1>Hello, world!</h1>
 
diff --git a/src/Components/Samples/BlazorServerApp/Shared/MainLayout.razor b/src/Components/Samples/BlazorServerApp/Shared/MainLayout.razor
index 0efbcd4908..d353bfa08f 100644
--- a/src/Components/Samples/BlazorServerApp/Shared/MainLayout.razor
+++ b/src/Components/Samples/BlazorServerApp/Shared/MainLayout.razor
@@ -1,4 +1,4 @@
-@inherits LayoutComponentBase
+@inherits LayoutComponentBase
 
 <div class="sidebar">
     <NavMenu />
diff --git a/src/Components/Samples/BlazorServerApp/Shared/NavMenu.razor b/src/Components/Samples/BlazorServerApp/Shared/NavMenu.razor
index f96cc8326c..99495049ac 100644
--- a/src/Components/Samples/BlazorServerApp/Shared/NavMenu.razor
+++ b/src/Components/Samples/BlazorServerApp/Shared/NavMenu.razor
@@ -1,4 +1,4 @@
-<div class="top-row pl-4 navbar navbar-dark">
+<div class="top-row pl-4 navbar navbar-dark">
     <a class="navbar-brand" href="">BlazorServerApp</a>
     <button class="navbar-toggler" @onclick="ToggleNavMenu">
         <span class="navbar-toggler-icon"></span>
diff --git a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/_Imports.razor b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/_Imports.razor
index 66ebfa5d18..77285129da 100644
--- a/src/Components/WebAssembly/testassets/HostedInAspNet.Client/_Imports.razor
+++ b/src/Components/WebAssembly/testassets/HostedInAspNet.Client/_Imports.razor
@@ -1 +1 @@
-@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web
diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/App.razor b/src/Components/WebAssembly/testassets/StandaloneApp/App.razor
index fe6830bb01..614e22ceb4 100644
--- a/src/Components/WebAssembly/testassets/StandaloneApp/App.razor
+++ b/src/Components/WebAssembly/testassets/StandaloneApp/App.razor
@@ -1,4 +1,4 @@
-<Router AppAssembly=typeof(StandaloneApp.Program).Assembly>
+<Router AppAssembly=typeof(StandaloneApp.Program).Assembly>
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
     </Found>
diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Counter.razor b/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Counter.razor
index 1f063003c8..59c0d242c3 100644
--- a/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Counter.razor
+++ b/src/Components/WebAssembly/testassets/StandaloneApp/Pages/Counter.razor
@@ -1,4 +1,4 @@
-@page "/counter"
+@page "/counter"
 
 <h1>Counter</h1>
 
diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/Pages/FetchData.razor b/src/Components/WebAssembly/testassets/StandaloneApp/Pages/FetchData.razor
index 0ed7245e45..b82bcb6486 100644
--- a/src/Components/WebAssembly/testassets/StandaloneApp/Pages/FetchData.razor
+++ b/src/Components/WebAssembly/testassets/StandaloneApp/Pages/FetchData.razor
@@ -1,4 +1,4 @@
-@page "/fetchdata"
+@page "/fetchdata"
 @page "/fetchdata/{StartDate:datetime}"
 @inject HttpClient Http
 
diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/Shared/MainLayout.razor b/src/Components/WebAssembly/testassets/StandaloneApp/Shared/MainLayout.razor
index 902e3edb08..0f4e22a943 100644
--- a/src/Components/WebAssembly/testassets/StandaloneApp/Shared/MainLayout.razor
+++ b/src/Components/WebAssembly/testassets/StandaloneApp/Shared/MainLayout.razor
@@ -1,4 +1,4 @@
-@inherits LayoutComponentBase
+@inherits LayoutComponentBase
 
 <div class="sidebar">
     <NavMenu />
diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/Shared/NavMenu.razor b/src/Components/WebAssembly/testassets/StandaloneApp/Shared/NavMenu.razor
index 298bdd36f1..ea57a26e8e 100644
--- a/src/Components/WebAssembly/testassets/StandaloneApp/Shared/NavMenu.razor
+++ b/src/Components/WebAssembly/testassets/StandaloneApp/Shared/NavMenu.razor
@@ -1,4 +1,4 @@
-<div class="top-row pl-4 navbar navbar-dark">
+<div class="top-row pl-4 navbar navbar-dark">
     <a class="navbar-brand" href="">Blazor app</a>
     <button class="navbar-toggler" @onclick=ToggleNavMenu>
         <span class="navbar-toggler-icon"></span>
diff --git a/src/Components/WebAssembly/testassets/StandaloneApp/_Imports.razor b/src/Components/WebAssembly/testassets/StandaloneApp/_Imports.razor
index 99ac4c2596..d7277e2677 100644
--- a/src/Components/WebAssembly/testassets/StandaloneApp/_Imports.razor
+++ b/src/Components/WebAssembly/testassets/StandaloneApp/_Imports.razor
@@ -1,4 +1,4 @@
-@using System.Net.Http
+@using System.Net.Http
 @using System.Net.Http.Json
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/App.razor b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/App.razor
index d700070807..a298515d5a 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/App.razor
+++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/App.razor
@@ -1,4 +1,4 @@
-<CascadingAuthenticationState>
+<CascadingAuthenticationState>
     <Router AppAssembly="@typeof(Program).Assembly">
         <Found Context="routeData">
             <AuthorizeRouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)">
diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/AdminSettings.razor b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/AdminSettings.razor
index 573072a3ee..d93254e06b 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/AdminSettings.razor
+++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/AdminSettings.razor
@@ -1,4 +1,4 @@
-@page "/admin-settings"
+@page "/admin-settings"
 @attribute [Authorize(Roles = "admin")]
 @inject IAccessTokenProvider TokenProvider
 @inject NavigationManager Navigation
diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/Authentication.razor b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/Authentication.razor
index 06bbc96eb4..82bc701cdd 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/Authentication.razor
+++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/Authentication.razor
@@ -1,4 +1,4 @@
-@page "/authentication/{action}"
+@page "/authentication/{action}"
 @inject StateService State
 @inject AuthenticationStateProvider AuthenticationStateProvider
 @inject NavigationManager Navigation
diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/FetchData.razor b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/FetchData.razor
index 2967c904de..95cf7cb034 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/FetchData.razor
+++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/FetchData.razor
@@ -1,4 +1,4 @@
-@page "/fetchdata"
+@page "/fetchdata"
 @using Wasm.Authentication.Shared
 @implements IDisposable
 @attribute [Authorize]
diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/Index.razor b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/Index.razor
index 1f55ad4144..7d88599e94 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/Index.razor
+++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/Index.razor
@@ -1,4 +1,4 @@
-@page "/"
+@page "/"
 @inject StateService State
 @inject IJSRuntime JS
 <h1>Hello, world!</h1>
diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/MakeAdmin.razor b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/MakeAdmin.razor
index e1f23f8532..11a370c998 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/MakeAdmin.razor
+++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/MakeAdmin.razor
@@ -1,4 +1,4 @@
-@page "/new-admin"
+@page "/new-admin"
 @attribute [Authorize]
 @inject IAccessTokenProvider TokenProvider
 @inject NavigationManager Navigation
diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/User.razor b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/User.razor
index 010276ffb4..53c7b84b69 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/User.razor
+++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/User.razor
@@ -1,4 +1,4 @@
-@page "/User"
+@page "/User"
 @attribute [Authorize]
 @using System.Text.Json
 @using System.Security.Claims
diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/UserPreferences.razor b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/UserPreferences.razor
index 978e1107bb..2a368cebc7 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/UserPreferences.razor
+++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Pages/UserPreferences.razor
@@ -1,4 +1,4 @@
-@page "/preferences"
+@page "/preferences"
 @attribute [Authorize]
 @using System.Text.Json;
 @using System.Text;
diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Shared/LoginDisplay.razor b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Shared/LoginDisplay.razor
index be15afdfe8..d1f683dd19 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Shared/LoginDisplay.razor
+++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Shared/LoginDisplay.razor
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Authorization
 @inject NavigationManager Navigation
 @inject SignOutSessionStateManager SignOutManager
 
diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Shared/NavMenu.razor b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Shared/NavMenu.razor
index b401588333..15ec3a160f 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Shared/NavMenu.razor
+++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Shared/NavMenu.razor
@@ -1,4 +1,4 @@
-<div class="top-row pl-4 navbar navbar-dark">
+<div class="top-row pl-4 navbar navbar-dark">
     <a class="navbar-brand" href="">Wasm.Authentication.Client</a>
     <button class="navbar-toggler" @onclick="ToggleNavMenu">
         <span class="navbar-toggler-icon"></span>
diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Shared/RedirectToLogin.razor b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Shared/RedirectToLogin.razor
index 56de7995d3..edc021dc81 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Shared/RedirectToLogin.razor
+++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/Shared/RedirectToLogin.razor
@@ -1,4 +1,4 @@
-@inject NavigationManager Navigation
+@inject NavigationManager Navigation
 @using Microsoft.Extensions.Options
 @inject IOptions<RemoteAuthenticationOptions<ApiAuthorizationProviderOptions>> Options
 @code {
diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/_Imports.razor b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/_Imports.razor
index 8e3d12c353..422d35afcd 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/_Imports.razor
+++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Client/_Imports.razor
@@ -1,4 +1,4 @@
-@using System.Net.Http
+@using System.Net.Http
 @using System.Net.Http.Json
 @using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.AspNetCore.Components.WebAssembly.Authentication
diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Pages/Error.cshtml b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Pages/Error.cshtml
index 321d2852c8..dde11ef549 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Pages/Error.cshtml
+++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Pages/Error.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @namespace Wasm.Authentication.Server.Pages
 @model ErrorModel
 @{
diff --git a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Pages/Shared/_LoginPartial.cshtml b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Pages/Shared/_LoginPartial.cshtml
index 3fa8e3e723..392dd61f81 100644
--- a/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Pages/Shared/_LoginPartial.cshtml
+++ b/src/Components/WebAssembly/testassets/Wasm.Authentication.Server/Pages/Shared/_LoginPartial.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Identity
+@using Microsoft.AspNetCore.Identity
 @using Wasm.Authentication.Server.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
diff --git a/src/Components/benchmarkapps/BlazingPizza.Server/Pages/Checkout.razor b/src/Components/benchmarkapps/BlazingPizza.Server/Pages/Checkout.razor
index f7713f7fc5..e41d5dd204 100644
--- a/src/Components/benchmarkapps/BlazingPizza.Server/Pages/Checkout.razor
+++ b/src/Components/benchmarkapps/BlazingPizza.Server/Pages/Checkout.razor
@@ -1,4 +1,4 @@
-@page "/checkout"
+@page "/checkout"
 @inject OrderState OrderState
 
 <div class="main">
diff --git a/src/Components/benchmarkapps/BlazingPizza.Server/Pages/Map.razor b/src/Components/benchmarkapps/BlazingPizza.Server/Pages/Map.razor
index 3aef1216a1..913dec9bd2 100644
--- a/src/Components/benchmarkapps/BlazingPizza.Server/Pages/Map.razor
+++ b/src/Components/benchmarkapps/BlazingPizza.Server/Pages/Map.razor
@@ -1,4 +1,4 @@
-@page "/orderstatus"
+@page "/orderstatus"
 @using System.Threading
 @using Microsoft.JSInterop
 @inject IJSRuntime JSRuntime
diff --git a/src/Components/benchmarkapps/BlazingPizza.Server/Shared/AddressEditor.razor b/src/Components/benchmarkapps/BlazingPizza.Server/Shared/AddressEditor.razor
index e2ef38a346..3842ce3f27 100644
--- a/src/Components/benchmarkapps/BlazingPizza.Server/Shared/AddressEditor.razor
+++ b/src/Components/benchmarkapps/BlazingPizza.Server/Shared/AddressEditor.razor
@@ -1,4 +1,4 @@
-<div class="form-field">
+<div class="form-field">
     <label>Name:</label>
     <div>
         <InputText @bind-Value="@Address.Name" />
diff --git a/src/Components/benchmarkapps/BlazingPizza.Server/Shared/OrderReview.razor b/src/Components/benchmarkapps/BlazingPizza.Server/Shared/OrderReview.razor
index 84808684e7..a2d096d98c 100644
--- a/src/Components/benchmarkapps/BlazingPizza.Server/Shared/OrderReview.razor
+++ b/src/Components/benchmarkapps/BlazingPizza.Server/Shared/OrderReview.razor
@@ -1,4 +1,4 @@
-@foreach (var pizza in Order.Pizzas)
+@foreach (var pizza in Order.Pizzas)
 {
     <p>
         <strong>
diff --git a/src/Components/benchmarkapps/BlazingPizza.Server/Shared/TemplatedDialog.razor b/src/Components/benchmarkapps/BlazingPizza.Server/Shared/TemplatedDialog.razor
index 4388d3e181..88b71fad2b 100644
--- a/src/Components/benchmarkapps/BlazingPizza.Server/Shared/TemplatedDialog.razor
+++ b/src/Components/benchmarkapps/BlazingPizza.Server/Shared/TemplatedDialog.razor
@@ -1,4 +1,4 @@
-@if (Show)
+@if (Show)
 {
     <div class="dialog-container">
         <div class="dialog">
diff --git a/src/Components/benchmarkapps/BlazingPizza.Server/Shared/TemplatedList.razor b/src/Components/benchmarkapps/BlazingPizza.Server/Shared/TemplatedList.razor
index fc91d33411..2ecdf92bbd 100644
--- a/src/Components/benchmarkapps/BlazingPizza.Server/Shared/TemplatedList.razor
+++ b/src/Components/benchmarkapps/BlazingPizza.Server/Shared/TemplatedList.razor
@@ -1,4 +1,4 @@
-@typeparam TItem
+@typeparam TItem
 
 @if (items == null)
 {
diff --git a/src/Components/benchmarkapps/BlazingPizza.Server/_Imports.razor b/src/Components/benchmarkapps/BlazingPizza.Server/_Imports.razor
index 0340e40de8..f9e4f6730d 100644
--- a/src/Components/benchmarkapps/BlazingPizza.Server/_Imports.razor
+++ b/src/Components/benchmarkapps/BlazingPizza.Server/_Imports.razor
@@ -1,4 +1,4 @@
-@using System.Net.Http
+@using System.Net.Http
 @using Microsoft.AspNetCore.Authorization
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Routing
diff --git a/src/Components/benchmarkapps/Wasm.Performance/TestApp/App.razor b/src/Components/benchmarkapps/Wasm.Performance/TestApp/App.razor
index fe885300e7..406b00a1f0 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/TestApp/App.razor
+++ b/src/Components/benchmarkapps/Wasm.Performance/TestApp/App.razor
@@ -1,4 +1,4 @@
-<Router AppAssembly=typeof(Program).Assembly>
+<Router AppAssembly=typeof(Program).Assembly>
     <Found Context="routeData">
         <RouteView RouteData="@routeData" />
     </Found>
diff --git a/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/Index.razor b/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/Index.razor
index 9de3b230e4..9ca04290ec 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/Index.razor
+++ b/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/Index.razor
@@ -1,4 +1,4 @@
-@page "/"
+@page "/"
 @inject IJSRuntime JSRuntime
 
 Hello, world!
diff --git a/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/Json.razor b/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/Json.razor
index 1c0d37ea9d..d5dcfa8bdb 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/Json.razor
+++ b/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/Json.razor
@@ -1,4 +1,4 @@
-@page "/json"
+@page "/json"
 @using System.Text.Json
 @inject IJSRuntime JSRuntime
 
diff --git a/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/OrgChart.razor b/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/OrgChart.razor
index c89854981a..84936c7b1a 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/OrgChart.razor
+++ b/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/OrgChart.razor
@@ -1,4 +1,4 @@
-@page "/orgchart"
+@page "/orgchart"
 @inject IJSRuntime JSRuntime
 
 <h1>Org Chart</h1>
diff --git a/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/PersonDisplay.razor b/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/PersonDisplay.razor
index 00e8cdddb3..1384364d61 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/PersonDisplay.razor
+++ b/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/PersonDisplay.razor
@@ -1,4 +1,4 @@
-@inject IJSRuntime JSRuntime
+@inject IJSRuntime JSRuntime
 
 <div class="person">
     <h2>
diff --git a/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/RenderList.razor b/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/RenderList.razor
index 95fcb40963..ef2fe2e92e 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/RenderList.razor
+++ b/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/RenderList.razor
@@ -1,4 +1,4 @@
-@page "/renderlist"
+@page "/renderlist"
 @inject IJSRuntime JSRuntime
 
 <h2>Render List</h2>
diff --git a/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/TimerComponent.razor b/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/TimerComponent.razor
index 10def1b4e1..c458a0328f 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/TimerComponent.razor
+++ b/src/Components/benchmarkapps/Wasm.Performance/TestApp/Pages/TimerComponent.razor
@@ -1,4 +1,4 @@
-@page "/timer"
+@page "/timer"
 @inject IJSRuntime JSRuntime
 @using System.Threading
 @implements IDisposable
diff --git a/src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/MainLayout.razor b/src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/MainLayout.razor
index 8b4e64bb66..722dd4bb22 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/MainLayout.razor
+++ b/src/Components/benchmarkapps/Wasm.Performance/TestApp/Shared/MainLayout.razor
@@ -1,4 +1,4 @@
-@inherits LayoutComponentBase
+@inherits LayoutComponentBase
 
 <h1>E2E Performance</h1>
 
diff --git a/src/Components/benchmarkapps/Wasm.Performance/TestApp/_Imports.razor b/src/Components/benchmarkapps/Wasm.Performance/TestApp/_Imports.razor
index 638e1ea028..87722def1f 100644
--- a/src/Components/benchmarkapps/Wasm.Performance/TestApp/_Imports.razor
+++ b/src/Components/benchmarkapps/Wasm.Performance/TestApp/_Imports.razor
@@ -1,4 +1,4 @@
-@using System.Net.Http
+@using System.Net.Http
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Web
diff --git a/src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.razor b/src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.razor
index 1c05a7166c..f235571019 100644
--- a/src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.razor
+++ b/src/Components/test/testassets/BasicTestApp/AddRemoveChildComponents.razor
@@ -1,4 +1,4 @@
-@using System.Collections.Generic
+@using System.Collections.Generic
 Child components follow.
 <button class="addChild" @onclick="AddChild">Add</button>
 <button class="removeChild" @onclick="RemoveChild">Remove</button>
diff --git a/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor b/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor
index 7092993113..623c1a5e34 100644
--- a/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/AfterRenderInteropComponent.razor
@@ -1,4 +1,4 @@
-@using Microsoft.JSInterop
+@using Microsoft.JSInterop
 @inject IJSRuntime JSRuntime
 
 <input @ref="myInput" value="Value set during render" />
diff --git a/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor b/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor
index a3faf11d11..07cbcb6663 100644
--- a/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/AsyncEventHandlerComponent.razor
@@ -1,4 +1,4 @@
-@using System.Threading.Tasks
+@using System.Threading.Tasks
 
 <div>
     <span id="state">@state</span>
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthHome.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthHome.razor
index 863f865a98..6e6989007c 100644
--- a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthHome.razor
+++ b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthHome.razor
@@ -1,3 +1,3 @@
-@page "/AuthHome"
+@page "/AuthHome"
 
 Select an auth test below.
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor
index e87c94373a..c6a3a8fe9d 100644
--- a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor
+++ b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouter.razor
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Components.Authorization
+@using Microsoft.AspNetCore.Components.Authorization
 @using Microsoft.AspNetCore.Components.Routing
 @inject NavigationManager NavigationManager
 
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouterLayout.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouterLayout.razor
index 71c040058f..6aa01df1f0 100644
--- a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouterLayout.razor
+++ b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthRouterLayout.razor
@@ -1,4 +1,4 @@
-@inherits LayoutComponentBase
+@inherits LayoutComponentBase
 
 @Body
 
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthorizeViewCases.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthorizeViewCases.razor
index f925d65630..074dd188b7 100644
--- a/src/Components/test/testassets/BasicTestApp/AuthTest/AuthorizeViewCases.razor
+++ b/src/Components/test/testassets/BasicTestApp/AuthTest/AuthorizeViewCases.razor
@@ -1,4 +1,4 @@
-@page "/AuthorizeViewCases"
+@page "/AuthorizeViewCases"
 @using Microsoft.AspNetCore.Components.Authorization
 
 <div id="no-authorization-rule">
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/CascadingAuthenticationStateConsumer.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/CascadingAuthenticationStateConsumer.razor
index 7c610d6dee..48852bf729 100644
--- a/src/Components/test/testassets/BasicTestApp/AuthTest/CascadingAuthenticationStateConsumer.razor
+++ b/src/Components/test/testassets/BasicTestApp/AuthTest/CascadingAuthenticationStateConsumer.razor
@@ -1,4 +1,4 @@
-@page "/CascadingAuthenticationStateConsumer"
+@page "/CascadingAuthenticationStateConsumer"
 @using System.Security.Claims
 @using Microsoft.AspNetCore.Components.Authorization
 
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/PageAllowingAnonymous.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/PageAllowingAnonymous.razor
index 7a5d7597e3..1a70528dca 100644
--- a/src/Components/test/testassets/BasicTestApp/AuthTest/PageAllowingAnonymous.razor
+++ b/src/Components/test/testassets/BasicTestApp/AuthTest/PageAllowingAnonymous.razor
@@ -1,4 +1,4 @@
-@page "/PageAllowingAnonymous"
+@page "/PageAllowingAnonymous"
 @using Microsoft.AspNetCore.Authorization
 @attribute [Authorize(Roles = "NobodyIsInThisRole")]
 @attribute [AllowAnonymous]
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringAuthorization.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringAuthorization.razor
index a509e07df8..052b2ae8b7 100644
--- a/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringAuthorization.razor
+++ b/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringAuthorization.razor
@@ -1,4 +1,4 @@
-@page "/PageRequiringAuthorization"
+@page "/PageRequiringAuthorization"
 @using Microsoft.AspNetCore.Authorization
 @attribute [Authorize]
 <div id="auth-success">Welcome to PageRequiringAuthorization!</div>
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringPolicy.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringPolicy.razor
index 61d831b9f6..8fbd831240 100644
--- a/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringPolicy.razor
+++ b/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringPolicy.razor
@@ -1,4 +1,4 @@
-@page "/PageRequiringPolicy"
+@page "/PageRequiringPolicy"
 @using Microsoft.AspNetCore.Authorization
 @attribute [Authorize(Policy = "NameMustStartWithB")]
 <div id="auth-success">Welcome to PageRequiringPolicy!</div>
diff --git a/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringRole.razor b/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringRole.razor
index e12462c7e2..eb548cbf2d 100644
--- a/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringRole.razor
+++ b/src/Components/test/testassets/BasicTestApp/AuthTest/PageRequiringRole.razor
@@ -1,4 +1,4 @@
-@page "/PageRequiringRole"
+@page "/PageRequiringRole"
 @using Microsoft.AspNetCore.Authorization
 @attribute [Authorize(Roles = "TestRole")]
 <div id="auth-success">Welcome to PageRequiringRole!</div>
diff --git a/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor b/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor
index 8780e1c133..fed6d516df 100644
--- a/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/BindCasesComponent.razor
@@ -1,4 +1,4 @@
-<h3 id="bind-cases">Bind cases</h3>
+<h3 id="bind-cases">Bind cases</h3>
 
 @* There are a mix of cases here using bind and bind-value for coverage *@
 
diff --git a/src/Components/test/testassets/BasicTestApp/BindGenericComponent.razor b/src/Components/test/testassets/BasicTestApp/BindGenericComponent.razor
index 1b660bc859..000593d7fc 100644
--- a/src/Components/test/testassets/BasicTestApp/BindGenericComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/BindGenericComponent.razor
@@ -1,4 +1,4 @@
-@typeparam TValue
+@typeparam TValue
 
 <input id="@Id" type="text" value="@Value" @onchange="@(EventCallback.Factory.CreateBinder<TValue>(this, _ => ValueChanged.InvokeAsync(_), Value))" />
 
diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueIntermediary.razor b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueIntermediary.razor
index b6db3ef1c3..278db0bdab 100644
--- a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueIntermediary.razor
+++ b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueIntermediary.razor
@@ -1,4 +1,4 @@
-@*
+@*
     The only purpose of this component is to validate that cascaded value updates
     can pass through entirely unrelated components that wouldn't normally rerender
     their children when they themselves are being rerendered.
diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.razor b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.razor
index ce912c78f8..505927699a 100644
--- a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.razor
+++ b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByName.razor
@@ -1,4 +1,4 @@
-@*
+@*
     This component is to show that we can differentiate cascaded values
     by name if they are of the same type.
 *@
diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.razor b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.razor
index e51cfd66cd..1216310fb1 100644
--- a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.razor
+++ b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveByType.razor
@@ -1,4 +1,4 @@
-<p>
+<p>
     Current count:
     <strong id="current-count">@CurrentCounter.NumClicks</strong>
 </p>
diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.razor b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.razor
index 24777b635b..088236e3a9 100644
--- a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.razor
+++ b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueReceiveFixedByInterface.razor
@@ -1,4 +1,4 @@
-@*
+@*
     This component is to show that:
 
     1. We can match a cascading parameter based on interface
diff --git a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.razor b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.razor
index 6557c0b30b..08448dcaf5 100644
--- a/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.razor
+++ b/src/Components/test/testassets/BasicTestApp/CascadingValueTest/CascadingValueSupplier.razor
@@ -1,4 +1,4 @@
-@implements ICanDecrement
+@implements ICanDecrement
 
 @*
     While it looks somewhat ridiculous to nest so many CascadingValue components,
diff --git a/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor b/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor
index 1768d2b7cc..bb60adb4de 100644
--- a/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/ComponentRefComponent.razor
@@ -1,4 +1,4 @@
-<h1>Component capture</h1>
+<h1>Component capture</h1>
 
 <p>
     This shows how a component reference may be captured as a field value using 'ref' syntax.
diff --git a/src/Components/test/testassets/BasicTestApp/ComponentWithParameters.razor b/src/Components/test/testassets/BasicTestApp/ComponentWithParameters.razor
index 8ec03cf1f0..62e96e3471 100644
--- a/src/Components/test/testassets/BasicTestApp/ComponentWithParameters.razor
+++ b/src/Components/test/testassets/BasicTestApp/ComponentWithParameters.razor
@@ -1,4 +1,4 @@
-<h3 class="interactive">Component With Parameters</h3>
+<h3 class="interactive">Component With Parameters</h3>
 
 <ul class="Param1">
     @foreach (var value in Param1)
diff --git a/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor b/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor
index 980343734e..282ec1d381 100644
--- a/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor
+++ b/src/Components/test/testassets/BasicTestApp/ConcurrentRenderChild.razor
@@ -1,4 +1,4 @@
-<span>@(isAfterDelay ? "😊" :"WAITING")</span>
+<span>@(isAfterDelay ? "😊" :"WAITING")</span>
 @code
 {
     protected bool isAfterDelay;
diff --git a/src/Components/test/testassets/BasicTestApp/ConcurrentRenderParent.razor b/src/Components/test/testassets/BasicTestApp/ConcurrentRenderParent.razor
index 1c219bcbe3..2b9e38983e 100644
--- a/src/Components/test/testassets/BasicTestApp/ConcurrentRenderParent.razor
+++ b/src/Components/test/testassets/BasicTestApp/ConcurrentRenderParent.razor
@@ -1,4 +1,4 @@
-<p>
+<p>
     After a 1 second delay, the output should be 100x😊, with no remaining "WAITING" markers.
 </p>
 
diff --git a/src/Components/test/testassets/BasicTestApp/ConfigurationComponent.razor b/src/Components/test/testassets/BasicTestApp/ConfigurationComponent.razor
index 13b95fb037..2e34da7866 100644
--- a/src/Components/test/testassets/BasicTestApp/ConfigurationComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/ConfigurationComponent.razor
@@ -1,4 +1,4 @@
-@inject Microsoft.Extensions.Configuration.IConfiguration Config
+@inject Microsoft.Extensions.Configuration.IConfiguration Config
 @inject Microsoft.AspNetCore.Components.WebAssembly.Hosting.IWebAssemblyHostEnvironment HostEnvironment
 
 <ul>
diff --git a/src/Components/test/testassets/BasicTestApp/CounterComponent.razor b/src/Components/test/testassets/BasicTestApp/CounterComponent.razor
index 9de91502e1..1032c9391d 100644
--- a/src/Components/test/testassets/BasicTestApp/CounterComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/CounterComponent.razor
@@ -1,4 +1,4 @@
-<h1>Counter</h1>
+<h1>Counter</h1>
 <p>Current count: @currentCount</p>
 <p><button id="counter" @onclick="@(handleClicks ? (Action)IncrementCount : null)">Click me</button></p>
 
diff --git a/src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.razor b/src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.razor
index 74a639a506..e0ee276a2c 100644
--- a/src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.razor
+++ b/src/Components/test/testassets/BasicTestApp/CounterComponentUsingChild.razor
@@ -1,4 +1,4 @@
-<h1>Counter</h1>
+<h1>Counter</h1>
 
 <!-- Note: passing 'Message' parameter with lowercase name to show it's case insensitive -->
 <p>Current count: <MessageComponent message=@currentCount.ToString() /></p>
diff --git a/src/Components/test/testassets/BasicTestApp/CulturePicker.razor b/src/Components/test/testassets/BasicTestApp/CulturePicker.razor
index 69cb953b7e..5a32549632 100644
--- a/src/Components/test/testassets/BasicTestApp/CulturePicker.razor
+++ b/src/Components/test/testassets/BasicTestApp/CulturePicker.razor
@@ -1,4 +1,4 @@
-@inject NavigationManager NavigationManager
+@inject NavigationManager NavigationManager
 
 <h3>Select your language</h3>
 <select @onchange="@OnSelected" id="culture-selector">
diff --git a/src/Components/test/testassets/BasicTestApp/DataDashComponent.razor b/src/Components/test/testassets/BasicTestApp/DataDashComponent.razor
index 435ef0fc04..976323dae4 100644
--- a/src/Components/test/testassets/BasicTestApp/DataDashComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/DataDashComponent.razor
@@ -1,4 +1,4 @@
-<div id="cool_beans" data-tab="@TabId">@TabId</div>
+<div id="cool_beans" data-tab="@TabId">@TabId</div>
 
 @code {
     string TabId = "17";
diff --git a/src/Components/test/testassets/BasicTestApp/DispatchingComponent.razor b/src/Components/test/testassets/BasicTestApp/DispatchingComponent.razor
index 00075e9ebc..af48d814b6 100644
--- a/src/Components/test/testassets/BasicTestApp/DispatchingComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/DispatchingComponent.razor
@@ -1,4 +1,4 @@
-<h1>Dispatching</h1>
+<h1>Dispatching</h1>
 
 <p>
     Sometimes, renders need to be triggered in response to non-lifecyle events.
diff --git a/src/Components/test/testassets/BasicTestApp/DuplicateAttributesComponent.razor b/src/Components/test/testassets/BasicTestApp/DuplicateAttributesComponent.razor
index 8d7bcc2e33..de4671d2c2 100644
--- a/src/Components/test/testassets/BasicTestApp/DuplicateAttributesComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/DuplicateAttributesComponent.razor
@@ -1,4 +1,4 @@
-<div id="duplicate-on-element">
+<div id="duplicate-on-element">
     <DuplicateAttributesOnElementChildComponent
         BoolAttributeBefore="true"
         StringAttributeBefore="original-text"
diff --git a/src/Components/test/testassets/BasicTestApp/DuplicateAttributesOnElementChildComponent.razor b/src/Components/test/testassets/BasicTestApp/DuplicateAttributesOnElementChildComponent.razor
index d68e5f0619..ba74087136 100644
--- a/src/Components/test/testassets/BasicTestApp/DuplicateAttributesOnElementChildComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/DuplicateAttributesOnElementChildComponent.razor
@@ -1,4 +1,4 @@
-@if (StringAttributeBefore != null)
+@if (StringAttributeBefore != null)
 {
     <div string="@StringAttributeBefore"
          bool="@BoolAttributeBefore"
diff --git a/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor b/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor
index 36a003b48f..a99da1b201 100644
--- a/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/ElementRefComponent.razor
@@ -1,4 +1,4 @@
-@using Microsoft.JSInterop
+@using Microsoft.JSInterop
 @inject IJSRuntime JSRuntime
 
 <h1>Element capture</h1>
diff --git a/src/Components/test/testassets/BasicTestApp/ErrorComponent.razor b/src/Components/test/testassets/BasicTestApp/ErrorComponent.razor
index f0104fa467..f3f770bf1e 100644
--- a/src/Components/test/testassets/BasicTestApp/ErrorComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/ErrorComponent.razor
@@ -1,4 +1,4 @@
-<div>
+<div>
     <h2>Error throwing buttons</h2>
     <p>
         <button id="throw-simple-exception" @onclick="@(ThrowSimple)">Throw simple exception</button>
diff --git a/src/Components/test/testassets/BasicTestApp/EventBubblingComponent.razor b/src/Components/test/testassets/BasicTestApp/EventBubblingComponent.razor
index 90081be643..66c28ac823 100644
--- a/src/Components/test/testassets/BasicTestApp/EventBubblingComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventBubblingComponent.razor
@@ -1,4 +1,4 @@
-<h3 id="event-bubbling">Bubbling standard event</h3>
+<h3 id="event-bubbling">Bubbling standard event</h3>
 
 @* Temporarily hard-coding the internal names - this will be replaced once the Razor compiler supports @onevent:stopPropagation and @onevent:preventDefault *@
 <div @onclick="@(() => LogEvent("parent onclick"))">
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor
index 4dc6bb2281..898fd74679 100644
--- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/ButtonComponent.razor
@@ -1,4 +1,4 @@
-
+
 <button @onclick="OnClick">@Text</button>
 
 @code {
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.razor
index 20c64b0c95..131ba9f232 100644
--- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/EventCallbackCases.razor
@@ -1,4 +1,4 @@
-@*
+@*
     Test cases for using EventCallback with various delegate scenarios that used to be troublesome.
 
     Currently these cases are **VERBOSE** because we haven't yet landed the compiler support for EventCallback.
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.razor
index 9e14850b07..2729a9ef4f 100644
--- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/InnerButton.razor
@@ -1,4 +1,4 @@
-
+
 <button @onclick="OnClick">@Text</button>
 
 @code {
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.razor
index bcca360135..1decce2223 100644
--- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/MiddleButton.razor
@@ -1,4 +1,4 @@
-
+
 <InnerButton OnClick="@OnClick" Text="@Text"/>
 
 @code {
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor
index b3158c082b..52f2b1d03d 100644
--- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/StronglyTypedButton.razor
@@ -1,4 +1,4 @@
-
+
 <button @onclick="OnClick">@Text</button>
 
 @code {
diff --git a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.razor b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.razor
index f32acd1045..91168de963 100644
--- a/src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventCallbackTest/TemplatedControl.razor
@@ -1,4 +1,4 @@
-
+
 <div>
     @ChildContent
 </div>
diff --git a/src/Components/test/testassets/BasicTestApp/EventDisablingComponent.razor b/src/Components/test/testassets/BasicTestApp/EventDisablingComponent.razor
index 3ea59135fd..ac6e09cc11 100644
--- a/src/Components/test/testassets/BasicTestApp/EventDisablingComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventDisablingComponent.razor
@@ -1,4 +1,4 @@
-<h3 id="event-disabling">Disabling events</h3>
+<h3 id="event-disabling">Disabling events</h3>
 
 <p>
     <div @onclick="@(() => LogEvent("Got event on div"))" id="disabled-div" disabled style="border: 1px dashed red">Even though this div has a 'disabled' attribute, it still responds to mouse events, because you can't disable a div</div>
diff --git a/src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.razor b/src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.razor
index f344f0dbdc..d365de99de 100644
--- a/src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/EventPreventDefaultComponent.razor
@@ -1,4 +1,4 @@
-<h3>Prevent default</h3>
+<h3>Prevent default</h3>
 
 <p>
     Currently we don't call <code>preventDefault</code> by default on DOM events in most cases.
diff --git a/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor b/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor
index 235a28cc30..ed335dc9cd 100644
--- a/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor
+++ b/src/Components/test/testassets/BasicTestApp/ExternalContentPackage.razor
@@ -1,4 +1,4 @@
-@using TestContentPackage
+@using TestContentPackage
 @using Microsoft.JSInterop
 
 @inject IJSRuntime JSRuntime
diff --git a/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor b/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor
index 47876f8b02..3af7b37e75 100644
--- a/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/FocusEventComponent.razor
@@ -1,4 +1,4 @@
-@using System.Collections.Generic
+@using System.Collections.Generic
 
 <h2>Focus and activation</h2>
 
diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/MyOption.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/MyOption.razor
index 4931292b4c..b5cd477a8b 100644
--- a/src/Components/test/testassets/BasicTestApp/FormsTest/MyOption.razor
+++ b/src/Components/test/testassets/BasicTestApp/FormsTest/MyOption.razor
@@ -1,4 +1,4 @@
-<option @attributes="InputAttributes">@ChildContent</option>
+<option @attributes="InputAttributes">@ChildContent</option>
 
 @code {
     [Parameter(CaptureUnmatchedValues = true)]
diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor
index 1fd89a851f..a257c1f2c9 100644
--- a/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/FormsTest/NotifyPropertyChangedValidationComponent.razor
@@ -1,4 +1,4 @@
-@using System.ComponentModel
+@using System.ComponentModel
 @using System.ComponentModel.DataAnnotations
 @using System.Runtime.CompilerServices;
 @using Microsoft.AspNetCore.Components.Forms
diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor
index 35cbdcd893..8bceb63f5b 100644
--- a/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/FormsTest/SimpleValidationComponent.razor
@@ -1,4 +1,4 @@
-@using System.ComponentModel.DataAnnotations
+@using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Components.Forms
 
 <EditForm Model="@this" OnValidSubmit="@HandleValidSubmit" OnInvalidSubmit="@HandleInvalidSubmit" autocomplete="off">
diff --git a/src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.razor b/src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.razor
index 4cf0a9d80f..89a53802ee 100644
--- a/src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.razor
@@ -1,4 +1,4 @@
-@using System.ComponentModel.DataAnnotations
+@using System.ComponentModel.DataAnnotations
 @using Microsoft.AspNetCore.Components.Forms
 
 <EditForm EditContext="@editContext" OnValidSubmit="@HandleValidSubmit">
diff --git a/src/Components/test/testassets/BasicTestApp/GlobalizationBindCases.razor b/src/Components/test/testassets/BasicTestApp/GlobalizationBindCases.razor
index 04b93ea0d3..8fa4e99e3d 100644
--- a/src/Components/test/testassets/BasicTestApp/GlobalizationBindCases.razor
+++ b/src/Components/test/testassets/BasicTestApp/GlobalizationBindCases.razor
@@ -1,4 +1,4 @@
-@using System.Globalization
+@using System.Globalization
 @using Microsoft.AspNetCore.Components.Forms
 <h3 id="globalization-cases">Globalization Bind Cases</h3>
 <h3 id="culture-name-display">Culture is: @System.Globalization.CultureInfo.CurrentCulture.Name</h3>
diff --git a/src/Components/test/testassets/BasicTestApp/HtmlBlockChildContent.razor b/src/Components/test/testassets/BasicTestApp/HtmlBlockChildContent.razor
index 411bf362f8..93b1976505 100644
--- a/src/Components/test/testassets/BasicTestApp/HtmlBlockChildContent.razor
+++ b/src/Components/test/testassets/BasicTestApp/HtmlBlockChildContent.razor
@@ -1 +1 @@
-<PassThroughContentComponent><div id="foo"><p>Some-Static-Text</p></div></PassThroughContentComponent>
\ No newline at end of file
+<PassThroughContentComponent><div id="foo"><p>Some-Static-Text</p></div></PassThroughContentComponent>
\ No newline at end of file
diff --git a/src/Components/test/testassets/BasicTestApp/HtmlEncodedChildContent.razor b/src/Components/test/testassets/BasicTestApp/HtmlEncodedChildContent.razor
index e621b8589c..7490902d41 100644
--- a/src/Components/test/testassets/BasicTestApp/HtmlEncodedChildContent.razor
+++ b/src/Components/test/testassets/BasicTestApp/HtmlEncodedChildContent.razor
@@ -1,4 +1,4 @@
-<div>
+<div>
 <PassThroughContentComponent>
 <div id="one"><p>Some-Static-Text</p></div>
 <div id="two">&lt;span&gt;More-Static-Text&lt;/span&gt;</div>
diff --git a/src/Components/test/testassets/BasicTestApp/HtmlMixedChildContent.razor b/src/Components/test/testassets/BasicTestApp/HtmlMixedChildContent.razor
index 97808e2888..ef98d4ce28 100644
--- a/src/Components/test/testassets/BasicTestApp/HtmlMixedChildContent.razor
+++ b/src/Components/test/testassets/BasicTestApp/HtmlMixedChildContent.razor
@@ -1,4 +1,4 @@
-<div>
+<div>
 <PassThroughContentComponent>
 <div id="one"><p>Some-Static-Text</p></div>
 <div id="two"><span>More-Static-Text</span></div>
diff --git a/src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.razor b/src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.razor
index de6a18165c..4f15dea614 100644
--- a/src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/HttpClientTest/BinaryHttpRequestsComponent.razor
@@ -1,4 +1,4 @@
-@using System.Net
+@using System.Net
 @using System.Net.Http
 @inject HttpClient Http
 
diff --git a/src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.razor b/src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.razor
index 7497f884f9..921520189f 100644
--- a/src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/HttpClientTest/CookieCounterComponent.razor
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Components.WebAssembly.Http
+@using Microsoft.AspNetCore.Components.WebAssembly.Http
 @using System.Net.Http
 @inject System.Net.Http.HttpClient Http
 
diff --git a/src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor b/src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor
index 26b454001e..ab4e21583f 100644
--- a/src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/HttpClientTest/HttpRequestsComponent.razor
@@ -1,4 +1,4 @@
-@using System.Net
+@using System.Net
 @using System.Net.Http
 @inject HttpClient Http
 
diff --git a/src/Components/test/testassets/BasicTestApp/Index.razor b/src/Components/test/testassets/BasicTestApp/Index.razor
index 8301bf31b9..0a8ce0a5cc 100644
--- a/src/Components/test/testassets/BasicTestApp/Index.razor
+++ b/src/Components/test/testassets/BasicTestApp/Index.razor
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Components.Rendering
+@using Microsoft.AspNetCore.Components.Rendering
 <div id="test-selector">
     Select test:
     <select id="test-selector-select" @bind=SelectedComponentTypeName>
diff --git a/src/Components/test/testassets/BasicTestApp/InputEventComponent.razor b/src/Components/test/testassets/BasicTestApp/InputEventComponent.razor
index ecbc828390..6082d4647c 100644
--- a/src/Components/test/testassets/BasicTestApp/InputEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/InputEventComponent.razor
@@ -1,4 +1,4 @@
-<input @bind-value=inputText @bind-value:event="oninput" />
+<input @bind-value=inputText @bind-value:event="oninput" />
 
 <p>The text below should update automatically as you type in the text field above</p>
 
diff --git a/src/Components/test/testassets/BasicTestApp/InteropComponent.razor b/src/Components/test/testassets/BasicTestApp/InteropComponent.razor
index 9e2167b4b0..d329d68900 100644
--- a/src/Components/test/testassets/BasicTestApp/InteropComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/InteropComponent.razor
@@ -1,4 +1,4 @@
-@using Microsoft.JSInterop
+@using Microsoft.JSInterop
 @using BasicTestApp.InteropTest
 @using System.Runtime.InteropServices
 @using System.Text.Json
diff --git a/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor b/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor
index ddd4a0ec07..f897b3ae5f 100644
--- a/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/InteropOnInitializationComponent.razor
@@ -1,4 +1,4 @@
-@page "/prerendered-interop"
+@page "/prerendered-interop"
 @using Microsoft.AspNetCore.Components
 @using Microsoft.JSInterop
 @inject IJSRuntime JSRuntime
diff --git a/src/Components/test/testassets/BasicTestApp/JsonSerializationCases.razor b/src/Components/test/testassets/BasicTestApp/JsonSerializationCases.razor
index 7f1b227f58..31c88eef18 100644
--- a/src/Components/test/testassets/BasicTestApp/JsonSerializationCases.razor
+++ b/src/Components/test/testassets/BasicTestApp/JsonSerializationCases.razor
@@ -1,4 +1,4 @@
-@using System.Text.Json
+@using System.Text.Json
 @using System.Text.Json.Serialization
 
 <h3 id="json-serialization-cases">JSON serialization cases</h3>
diff --git a/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor b/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor
index 582913ae27..168e387123 100644
--- a/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/KeyCasesComponent.razor
@@ -1,4 +1,4 @@
-@using System.Text.Json
+@using System.Text.Json
 <div class="key-cases">
     <div class="model">
         <p>Model</p>
diff --git a/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor b/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor
index dcc321eaf6..851e6e91a7 100644
--- a/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor
+++ b/src/Components/test/testassets/BasicTestApp/KeyCasesTreeNode.razor
@@ -1,4 +1,4 @@
-<div class="node">
+<div class="node">
     <strong class="label">@Data.Label</strong>
     &nbsp;&nbsp;[
     Instance: @instanceId;
diff --git a/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor b/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor
index dd96e41d51..43db51d66b 100644
--- a/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/KeyPressEventComponent.razor
@@ -1,4 +1,4 @@
-@using System.Text.Json
+@using System.Text.Json
 
 Type here: <input @onkeypress=OnKeyPressed />
 <ul>
diff --git a/src/Components/test/testassets/BasicTestApp/LaggyTypingComponent.razor b/src/Components/test/testassets/BasicTestApp/LaggyTypingComponent.razor
index 3d1598d424..5dc47aef04 100644
--- a/src/Components/test/testassets/BasicTestApp/LaggyTypingComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/LaggyTypingComponent.razor
@@ -1,4 +1,4 @@
-@using System.Threading
+@using System.Threading
 
 <input @bind-value=@InputText @bind-value:event="oninput" />
 <p id="test-result">@InputText</p>
diff --git a/src/Components/test/testassets/BasicTestApp/LimitCounterComponent.razor b/src/Components/test/testassets/BasicTestApp/LimitCounterComponent.razor
index bb60eb48cd..1f22e9f3d9 100644
--- a/src/Components/test/testassets/BasicTestApp/LimitCounterComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/LimitCounterComponent.razor
@@ -1,4 +1,4 @@
-<h1>Counter</h1>
+<h1>Counter</h1>
 
 <p>This counter component is used in the server-side limit tests to showcase that we keep dispatching and processing
     events when the unacknowledged render batches queue is full and that we produce the update UI once we receive an
diff --git a/src/Components/test/testassets/BasicTestApp/LocalizedText.razor b/src/Components/test/testassets/BasicTestApp/LocalizedText.razor
index 8423f226dd..a86579e3c9 100644
--- a/src/Components/test/testassets/BasicTestApp/LocalizedText.razor
+++ b/src/Components/test/testassets/BasicTestApp/LocalizedText.razor
@@ -1,2 +1,2 @@
-<h3 id="culture-name-display">Culture is: @System.Globalization.CultureInfo.CurrentCulture.Name</h3>
+<h3 id="culture-name-display">Culture is: @System.Globalization.CultureInfo.CurrentCulture.Name</h3>
 <p id="message-display">@Resources.Message</p>
diff --git a/src/Components/test/testassets/BasicTestApp/LoggingComponent.razor b/src/Components/test/testassets/BasicTestApp/LoggingComponent.razor
index 6ac41d792c..c574def21b 100644
--- a/src/Components/test/testassets/BasicTestApp/LoggingComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/LoggingComponent.razor
@@ -1,4 +1,4 @@
-@using Microsoft.Extensions.Logging
+@using Microsoft.Extensions.Logging
 @inject ILoggerFactory LoggerFactory
 
 <h2>Logging buttons</h2>
diff --git a/src/Components/test/testassets/BasicTestApp/LongRunningInterop.razor b/src/Components/test/testassets/BasicTestApp/LongRunningInterop.razor
index 81479decd4..1ff1843e4d 100644
--- a/src/Components/test/testassets/BasicTestApp/LongRunningInterop.razor
+++ b/src/Components/test/testassets/BasicTestApp/LongRunningInterop.razor
@@ -1,4 +1,4 @@
-@using Microsoft.JSInterop
+@using Microsoft.JSInterop
 @using BasicTestApp.InteropTest
 @using System.Runtime.InteropServices
 @using System.Text.Json
diff --git a/src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.razor b/src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.razor
index b0323f5871..73e802fbc4 100644
--- a/src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/MarkupBlockComponent.razor
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Components.Rendering
+@using Microsoft.AspNetCore.Components.Rendering
 <h1>Markup blocks</h1>
 
 <p>
diff --git a/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor b/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor
index a9356c80e0..9b9d05eedc 100644
--- a/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/MouseEventComponent.razor
@@ -1,4 +1,4 @@
-@using System.Collections.Generic
+@using System.Collections.Generic
 @using System.Text.Json
 
 <div>
diff --git a/src/Components/test/testassets/BasicTestApp/MovingCheckboxesComponent.razor b/src/Components/test/testassets/BasicTestApp/MovingCheckboxesComponent.razor
index beca5e04d3..481d7aa8fb 100644
--- a/src/Components/test/testassets/BasicTestApp/MovingCheckboxesComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/MovingCheckboxesComponent.razor
@@ -1,4 +1,4 @@
-<p>
+<p>
     This component represents a case that's difficult for the diff algorithm if it doesn't
     understand how the underlying DOM gets mutated when you check a box.
 </p>
diff --git a/src/Components/test/testassets/BasicTestApp/MultipleChildContent.razor b/src/Components/test/testassets/BasicTestApp/MultipleChildContent.razor
index 9229fb49ae..fdf7baebc2 100644
--- a/src/Components/test/testassets/BasicTestApp/MultipleChildContent.razor
+++ b/src/Components/test/testassets/BasicTestApp/MultipleChildContent.razor
@@ -1,4 +1,4 @@
-<TemplatedTable Items="@Items" Context="row">
+<TemplatedTable Items="@Items" Context="row">
     <Header><tr><th>Col1</th><th>Col2</th><th>Col3</th></tr></Header>
     <Footer>
         @if (ShowFooter)
diff --git a/src/Components/test/testassets/BasicTestApp/MultipleComponents/GreeterComponent.razor b/src/Components/test/testassets/BasicTestApp/MultipleComponents/GreeterComponent.razor
index 80d9391a65..3e72d1d5da 100644
--- a/src/Components/test/testassets/BasicTestApp/MultipleComponents/GreeterComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/MultipleComponents/GreeterComponent.razor
@@ -1,4 +1,4 @@
-<div class="greet-wrapper">
+<div class="greet-wrapper">
     <h3 class="@interactive">Greeter component</h3>
     <p class="greet">Hello @Name</p>
 </div>
diff --git a/src/Components/test/testassets/BasicTestApp/NavigationFailureComponent.razor b/src/Components/test/testassets/BasicTestApp/NavigationFailureComponent.razor
index f62cb87eb2..31df0dfdf7 100644
--- a/src/Components/test/testassets/BasicTestApp/NavigationFailureComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/NavigationFailureComponent.razor
@@ -1,4 +1,4 @@
-@implements IDisposable
+@implements IDisposable
 @inject NavigationManager Navigation
 @using Microsoft.AspNetCore.Components.Routing
 <p>
diff --git a/src/Components/test/testassets/BasicTestApp/OrderedList.razor b/src/Components/test/testassets/BasicTestApp/OrderedList.razor
index 2e832207bc..3666382445 100644
--- a/src/Components/test/testassets/BasicTestApp/OrderedList.razor
+++ b/src/Components/test/testassets/BasicTestApp/OrderedList.razor
@@ -1,4 +1,4 @@
-@typeparam TItem
+@typeparam TItem
 
 <ol>
     @{
diff --git a/src/Components/test/testassets/BasicTestApp/PrerenderedRedirection.razor b/src/Components/test/testassets/BasicTestApp/PrerenderedRedirection.razor
index 78bd99eabd..a6653b1838 100644
--- a/src/Components/test/testassets/BasicTestApp/PrerenderedRedirection.razor
+++ b/src/Components/test/testassets/BasicTestApp/PrerenderedRedirection.razor
@@ -1,4 +1,4 @@
-@page "/prerendered-redirection"
+@page "/prerendered-redirection"
 @inject NavigationManager NavigationManager
 
 @{
diff --git a/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor b/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor
index c2e2192ecd..2b8235fa85 100644
--- a/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor
+++ b/src/Components/test/testassets/BasicTestApp/PrerenderedToInteractiveTransition.razor
@@ -1,4 +1,4 @@
-@page "/prerendered-transition"
+@page "/prerendered-transition"
 @using Microsoft.AspNetCore.Components
 @using Microsoft.AspNetCore.Components.Authorization
 
diff --git a/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor b/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor
index 476e8cbb10..ac96131956 100644
--- a/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor
+++ b/src/Components/test/testassets/BasicTestApp/PropertiesChangedHandlerParent.razor
@@ -1,4 +1,4 @@
-<PropertiesChangedHandlerChild SuppliedValue=@valueToSupply />
+<PropertiesChangedHandlerChild SuppliedValue=@valueToSupply />
 <button @onclick=@(x => valueToSupply++)>Increment</button>
 
 @code {
diff --git a/src/Components/test/testassets/BasicTestApp/RazorTemplates.razor b/src/Components/test/testassets/BasicTestApp/RazorTemplates.razor
index 05ba535c0c..b5c67f93db 100644
--- a/src/Components/test/testassets/BasicTestApp/RazorTemplates.razor
+++ b/src/Components/test/testassets/BasicTestApp/RazorTemplates.razor
@@ -1,4 +1,4 @@
-@{
+@{
     var items = new string[] { "A", "B", "c", };
 }
 
diff --git a/src/Components/test/testassets/BasicTestApp/Reconnection/ReconnectionComponent.razor b/src/Components/test/testassets/BasicTestApp/Reconnection/ReconnectionComponent.razor
index edfb75cca2..ec5f659fa2 100644
--- a/src/Components/test/testassets/BasicTestApp/Reconnection/ReconnectionComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/Reconnection/ReconnectionComponent.razor
@@ -1,4 +1,4 @@
-@using System.Timers
+@using System.Timers
 @implements IDisposable
 <h3>Reconnection Component</h3>
 
diff --git a/src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.razor b/src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.razor
index a13806f756..e88e997e7b 100644
--- a/src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.razor
+++ b/src/Components/test/testassets/BasicTestApp/RenderFragmentToggler.razor
@@ -1,4 +1,4 @@
-<div>
+<div>
     <p>Fragment will be toggled below</p>
 
     @if (showFragment)
diff --git a/src/Components/test/testassets/BasicTestApp/ReorderingFocusComponent.razor b/src/Components/test/testassets/BasicTestApp/ReorderingFocusComponent.razor
index 35c315aa83..6eed155f00 100644
--- a/src/Components/test/testassets/BasicTestApp/ReorderingFocusComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/ReorderingFocusComponent.razor
@@ -1,4 +1,4 @@
-<h3>To do</h3>
+<h3>To do</h3>
 
 <p>
     This component will randomly reorder the todo items on each keystroke.
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/Default.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/Default.razor
index 8a45ef6a39..40a8b5d3a6 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/Default.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/Default.razor
@@ -1,3 +1,3 @@
-@page "/"
+@page "/"
 @page "/Default.html"
 <div id="test-info">This is the default page.</div>
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor
index 536fa70ad3..344286213f 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/Links.razor
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Routing
 @inject NavigationManager NavigationManager
 <style type="text/css">
     a.active {
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/LongPage1.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/LongPage1.razor
index 1a11a3dd3f..106ce78074 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/LongPage1.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/LongPage1.razor
@@ -1,4 +1,4 @@
-@page "/LongPage1"
+@page "/LongPage1"
 @inject NavigationManager NavigationManager
 <div id="test-info">This is a long page you can scroll.</div>
 
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/LongPage2.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/LongPage2.razor
index 95c3766264..f1ae7ee4c5 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/LongPage2.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/LongPage2.razor
@@ -1,4 +1,4 @@
-@page "/LongPage2"
+@page "/LongPage2"
 <div id="test-info">This is another long page you can scroll.</div>
 
 <div style="border: 2px dashed blue; margin: 1rem; padding: 1rem; height: 1500px;">
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/NavigationManagerComponent.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/NavigationManagerComponent.razor
index c5e422cce1..172ab87b13 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/NavigationManagerComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/NavigationManagerComponent.razor
@@ -1,4 +1,4 @@
-@using Microsoft.JSInterop
+@using Microsoft.JSInterop
 @using Microsoft.AspNetCore.Components.Routing
 
 @inject IJSRuntime JSRuntime
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/Other.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/Other.razor
index 3be36fce3b..d7a01e9bf3 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/Other.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/Other.razor
@@ -1,2 +1,2 @@
-@page "/Other"
+@page "/Other"
 <div id="test-info">This is another page.</div>
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/PreventDefaultCases.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/PreventDefaultCases.razor
index bb3591010f..ef5e672170 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/PreventDefaultCases.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/PreventDefaultCases.razor
@@ -1,4 +1,4 @@
-@page "/PreventDefaultCases"
+@page "/PreventDefaultCases"
 
 <h2>Interactions with preventDefault</h2>
 
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouter.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouter.razor
index 5959e597c0..1506433462 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouter.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouter.razor
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Routing
 <Router AppAssembly="@typeof(BasicTestApp.Program).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" />
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouterWithAdditionalAssembly.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouterWithAdditionalAssembly.razor
index c69f08f8c3..7e18c960c7 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouterWithAdditionalAssembly.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouterWithAdditionalAssembly.razor
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Components.Routing
+@using Microsoft.AspNetCore.Components.Routing
 <Router AppAssembly="@typeof(BasicTestApp.Program).Assembly" AdditionalAssemblies="@(new[] { typeof(TestContentPackage.RouteableComponentFromPackage).Assembly, })">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" />
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.razor
index 97d8559f9e..cd6766012d 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/WithNumberParameters.razor
@@ -1,4 +1,4 @@
-@page "/WithNumberParameters/{TestInt:int}/{TestLong:long}/{TestDouble:double}/{TestFloat:float}/{TestDec:decimal}"
+@page "/WithNumberParameters/{TestInt:int}/{TestLong:long}/{TestDouble:double}/{TestFloat:float}/{TestDec:decimal}"
 <div id="test-info">Test parameters: @TestInt @TestLong @TestDouble @TestFloat @TestDec</div>
 
 @code
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/WithOptionalParameter.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/WithOptionalParameter.razor
index 1e8070f61f..4de28b83ee 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/WithOptionalParameter.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/WithOptionalParameter.razor
@@ -1,4 +1,4 @@
-@page "/WithOptionalParameters/{age:int?}"
+@page "/WithOptionalParameters/{age:int?}"
 <div id="test-info">Your age is @Age.</div>
 
 @code
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.razor
index 4997af9ec1..a2d5122d6e 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/WithParameters.razor
@@ -1,4 +1,4 @@
-@page "/WithParameters/Name/{firstName}"
+@page "/WithParameters/Name/{firstName}"
 @page "/WithParameters/Name/{firstName}/LastName/{lastName}"
 <div id="test-info">Your full name is @FirstName @LastName.</div>
 
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/_Imports.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/_Imports.razor
index d92b5a4b60..ab1a52d5de 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/_Imports.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/_Imports.razor
@@ -1 +1 @@
-@layout RouterTestLayout
+@layout RouterTestLayout
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTestLayout.razor b/src/Components/test/testassets/BasicTestApp/RouterTestLayout.razor
index d2704a66d2..364710af8c 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTestLayout.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTestLayout.razor
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Components
+@using Microsoft.AspNetCore.Components
 @inherits LayoutComponentBase
 
 @Body
diff --git a/src/Components/test/testassets/BasicTestApp/SelectVariantsComponent.razor b/src/Components/test/testassets/BasicTestApp/SelectVariantsComponent.razor
index bf0b5cf130..7573b62fb3 100644
--- a/src/Components/test/testassets/BasicTestApp/SelectVariantsComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/SelectVariantsComponent.razor
@@ -1,4 +1,4 @@
-@using BasicTestApp.FormsTest
+@using BasicTestApp.FormsTest
 
 <input @bind="SelectValue" id="input-value"/>
 
diff --git a/src/Components/test/testassets/BasicTestApp/ServerReliability/ReliabilityComponent.razor b/src/Components/test/testassets/BasicTestApp/ServerReliability/ReliabilityComponent.razor
index 77fbab5eb5..319952cc89 100644
--- a/src/Components/test/testassets/BasicTestApp/ServerReliability/ReliabilityComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/ServerReliability/ReliabilityComponent.razor
@@ -1,4 +1,4 @@
-@using Microsoft.JSInterop
+@using Microsoft.JSInterop
 @inject IJSRuntime JSRuntime
 @namespace BasicTestApp
 @using BasicTestApp.ServerReliability
diff --git a/src/Components/test/testassets/BasicTestApp/ShowUriComponent.razor b/src/Components/test/testassets/BasicTestApp/ShowUriComponent.razor
index c810129d55..7b149458cb 100644
--- a/src/Components/test/testassets/BasicTestApp/ShowUriComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/ShowUriComponent.razor
@@ -1,3 +1,3 @@
-@page "/show-uri"
+@page "/show-uri"
 @inject NavigationManager NavigationManager
 The current URL is <strong>@NavigationManager.Uri</strong>
diff --git a/src/Components/test/testassets/BasicTestApp/StringComparisonComponent.razor b/src/Components/test/testassets/BasicTestApp/StringComparisonComponent.razor
index 7983a8558e..2f0da2a152 100644
--- a/src/Components/test/testassets/BasicTestApp/StringComparisonComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/StringComparisonComponent.razor
@@ -1,4 +1,4 @@
-@{
+@{
     // This test verifies that invariant cultue works correctly in WebAssembly environments. The test case is based on the discussions here: https://stackoverflow.com/a/20085219
     var string1 = "Strasse";
     var string2 = "Straße";
diff --git a/src/Components/test/testassets/BasicTestApp/SvgCircleComponent.razor b/src/Components/test/testassets/BasicTestApp/SvgCircleComponent.razor
index 1c2849b7c7..25ed6b4bc0 100644
--- a/src/Components/test/testassets/BasicTestApp/SvgCircleComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/SvgCircleComponent.razor
@@ -1 +1 @@
-<circle cx="125" cy="125" r="100" fill="red" stroke="black" stroke-width="3" />
\ No newline at end of file
+<circle cx="125" cy="125" r="100" fill="red" stroke="black" stroke-width="3" />
\ No newline at end of file
diff --git a/src/Components/test/testassets/BasicTestApp/SvgComponent.razor b/src/Components/test/testassets/BasicTestApp/SvgComponent.razor
index 2cece59303..0d93dffb69 100644
--- a/src/Components/test/testassets/BasicTestApp/SvgComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/SvgComponent.razor
@@ -1,4 +1,4 @@
-<svg height="250" width=250>
+<svg height="250" width=250>
     <circle cx="125" cy="125" r=@radius fill="red" stroke="black" stroke-width="3" />
 </svg>
 
diff --git a/src/Components/test/testassets/BasicTestApp/SvgWithChildComponent.razor b/src/Components/test/testassets/BasicTestApp/SvgWithChildComponent.razor
index 8ef5bd2046..5b8fa4ba15 100644
--- a/src/Components/test/testassets/BasicTestApp/SvgWithChildComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/SvgWithChildComponent.razor
@@ -1,4 +1,4 @@
-<h1>SVG with Child Component</h1>
+<h1>SVG with Child Component</h1>
 
 <svg height="250" width="250">
     <SvgCircleComponent />
diff --git a/src/Components/test/testassets/BasicTestApp/TemplatedTable.razor b/src/Components/test/testassets/BasicTestApp/TemplatedTable.razor
index 941a6532cf..65d4fae686 100644
--- a/src/Components/test/testassets/BasicTestApp/TemplatedTable.razor
+++ b/src/Components/test/testassets/BasicTestApp/TemplatedTable.razor
@@ -1,4 +1,4 @@
-@typeparam TItem
+@typeparam TItem
 <table>
     @if (Header != null)
     {
diff --git a/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor b/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor
index b9bbec0e21..492d42565a 100644
--- a/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor
+++ b/src/Components/test/testassets/BasicTestApp/TouchEventComponent.razor
@@ -1,4 +1,4 @@
-@using System.Collections.Generic
+@using System.Collections.Generic
 @using System.Text.Json
 
 <div>
diff --git a/src/Components/test/testassets/BasicTestApp/_Imports.razor b/src/Components/test/testassets/BasicTestApp/_Imports.razor
index 66ebfa5d18..77285129da 100644
--- a/src/Components/test/testassets/BasicTestApp/_Imports.razor
+++ b/src/Components/test/testassets/BasicTestApp/_Imports.razor
@@ -1 +1 @@
-@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web
diff --git a/src/Components/test/testassets/ComponentsApp.App/App.razor b/src/Components/test/testassets/ComponentsApp.App/App.razor
index 0d6b53a13a..128b9d99fc 100644
--- a/src/Components/test/testassets/ComponentsApp.App/App.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/App.razor
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Components;
+@using Microsoft.AspNetCore.Components;
 <CascadingValue Value="Name" Name="Name" IsFixed=true>
     <Router AppAssembly="@typeof(ComponentsApp.App.App).Assembly">
         <Found Context="routeData">
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Counter.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/Counter.razor
index 1c9007e49b..49f4dde4af 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Pages/Counter.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Counter.razor
@@ -1,4 +1,4 @@
-@page "/counter"
+@page "/counter"
 
 <h1>Counter</h1>
 
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Error.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/Error.razor
index 4fa5cb3979..dc7243b6f9 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Pages/Error.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Error.razor
@@ -1,4 +1,4 @@
-@page "/error"
+@page "/error"
 @using Microsoft.AspNetCore.Components
 <h1>Error</h1>
 @if(ShouldCauseError)
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.razor
index fd84937911..f47151e6ec 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/Pages/FetchData.razor
@@ -1,4 +1,4 @@
-@page "/fetchdata"
+@page "/fetchdata"
 @page "/fetchdata/{StartDate:datetime}"
 @inject WeatherForecastService ForecastService
 
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Greeter.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/Greeter.razor
index fd39012d86..63cd937a3a 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Pages/Greeter.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Greeter.razor
@@ -1,4 +1,4 @@
-@page "/greeter"
+@page "/greeter"
 @using Microsoft.AspNetCore.Components
 <h1>Greeter</h1>
 <p class="greeting">Hello @Name</p>
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Index.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/Index.razor
index ecc05ca6f4..7cd5230828 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Pages/Index.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Index.razor
@@ -1,4 +1,4 @@
-@page "/"
+@page "/"
 
 <h1 id="index">Hello, world!</h1>
 
diff --git a/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor b/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor
index 327c590242..04da3ce68c 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/Pages/Ticker.razor
@@ -1,4 +1,4 @@
-@page "/ticker"
+@page "/ticker"
 @implements IDisposable
 @using System.Threading
 
diff --git a/src/Components/test/testassets/ComponentsApp.App/Shared/MainLayout.razor b/src/Components/test/testassets/ComponentsApp.App/Shared/MainLayout.razor
index 3ec4a5afa4..8c47cabdc2 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Shared/MainLayout.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/Shared/MainLayout.razor
@@ -1,4 +1,4 @@
-@inherits LayoutComponentBase
+@inherits LayoutComponentBase
 
 <div class="sidebar">
     <NavMenu />
diff --git a/src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.razor b/src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.razor
index 57cd09af8c..404af96cba 100644
--- a/src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/Shared/NavMenu.razor
@@ -1,4 +1,4 @@
-<div class="top-row pl-4 navbar navbar-dark">
+<div class="top-row pl-4 navbar navbar-dark">
     <a class="navbar-brand" href="">Razor Components</a>
     <button class="navbar-toggler" @onclick=ToggleNavMenu>
         <span class="navbar-toggler-icon"></span>
diff --git a/src/Components/test/testassets/ComponentsApp.App/_Imports.razor b/src/Components/test/testassets/ComponentsApp.App/_Imports.razor
index 11fdd2ca05..a3e17a4dc7 100644
--- a/src/Components/test/testassets/ComponentsApp.App/_Imports.razor
+++ b/src/Components/test/testassets/ComponentsApp.App/_Imports.razor
@@ -1,4 +1,4 @@
-@using System.Net.Http
+@using System.Net.Http
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
 @using ComponentsApp.App
diff --git a/src/Components/test/testassets/ComponentsApp.Server/Pages/_Host.cshtml b/src/Components/test/testassets/ComponentsApp.Server/Pages/_Host.cshtml
index 5e34a117a5..cae1d63e10 100644
--- a/src/Components/test/testassets/ComponentsApp.Server/Pages/_Host.cshtml
+++ b/src/Components/test/testassets/ComponentsApp.Server/Pages/_Host.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @using ComponentsApp.App
 
 <!DOCTYPE html>
diff --git a/src/Components/test/testassets/TestContentPackage/ComponentFromPackage.razor b/src/Components/test/testassets/TestContentPackage/ComponentFromPackage.razor
index 3f30f3fd87..22c9c43e82 100644
--- a/src/Components/test/testassets/TestContentPackage/ComponentFromPackage.razor
+++ b/src/Components/test/testassets/TestContentPackage/ComponentFromPackage.razor
@@ -1,4 +1,4 @@
-<div class="special-style">
+<div class="special-style">
     This component, including the CSS and image required to produce its
     elegant styling, is in an external NuGet package.
     <button @onclick="ChangeLabel">@buttonLabel </button>
diff --git a/src/Components/test/testassets/TestContentPackage/RouteableComponentFromPackage.razor b/src/Components/test/testassets/TestContentPackage/RouteableComponentFromPackage.razor
index 1c5dde9e16..1dcbe4d323 100644
--- a/src/Components/test/testassets/TestContentPackage/RouteableComponentFromPackage.razor
+++ b/src/Components/test/testassets/TestContentPackage/RouteableComponentFromPackage.razor
@@ -1,4 +1,4 @@
-@page "/routeablecomponentfrompackage.html"
+@page "/routeablecomponentfrompackage.html"
 
 <div class="special-style">
     This component, including the CSS and image required to produce its
diff --git a/src/Components/test/testassets/TestContentPackage/_Imports.razor b/src/Components/test/testassets/TestContentPackage/_Imports.razor
index 66ebfa5d18..77285129da 100644
--- a/src/Components/test/testassets/TestContentPackage/_Imports.razor
+++ b/src/Components/test/testassets/TestContentPackage/_Imports.razor
@@ -1 +1 @@
-@using Microsoft.AspNetCore.Components.Web
+@using Microsoft.AspNetCore.Components.Web
diff --git a/src/Components/test/testassets/TestServer/Pages/Authentication.cshtml b/src/Components/test/testassets/TestServer/Pages/Authentication.cshtml
index 165618a019..d9bc519e21 100644
--- a/src/Components/test/testassets/TestServer/Pages/Authentication.cshtml
+++ b/src/Components/test/testassets/TestServer/Pages/Authentication.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @using Microsoft.AspNetCore.Authentication
 @using System.Security.Claims
 <!DOCTYPE html>
diff --git a/src/Components/test/testassets/TestServer/Pages/ComponentWithParameters.cshtml b/src/Components/test/testassets/TestServer/Pages/ComponentWithParameters.cshtml
index 3d630a05fd..f5e1d54528 100644
--- a/src/Components/test/testassets/TestServer/Pages/ComponentWithParameters.cshtml
+++ b/src/Components/test/testassets/TestServer/Pages/ComponentWithParameters.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 
 <component type="typeof(ComponentWithParameters)"
            render-mode="ServerPrerendered"
diff --git a/src/Components/test/testassets/TestServer/Pages/MultipleComponents.cshtml b/src/Components/test/testassets/TestServer/Pages/MultipleComponents.cshtml
index 7ad48b9f84..dff3093166 100644
--- a/src/Components/test/testassets/TestServer/Pages/MultipleComponents.cshtml
+++ b/src/Components/test/testassets/TestServer/Pages/MultipleComponents.cshtml
@@ -1,4 +1,4 @@
-@page "/multiple-components"
+@page "/multiple-components"
 @using BasicTestApp.MultipleComponents;
 
 @{
diff --git a/src/Components/test/testassets/TestServer/Pages/MultipleComponentsLayout.cshtml b/src/Components/test/testassets/TestServer/Pages/MultipleComponentsLayout.cshtml
index 8f96aa4835..b43ed417d5 100644
--- a/src/Components/test/testassets/TestServer/Pages/MultipleComponentsLayout.cshtml
+++ b/src/Components/test/testassets/TestServer/Pages/MultipleComponentsLayout.cshtml
@@ -1,4 +1,4 @@
-@using BasicTestApp.MultipleComponents;
+@using BasicTestApp.MultipleComponents;
 
 <!DOCTYPE html>
 <html>
diff --git a/src/Components/test/testassets/TestServer/Pages/PrerenderedHost.cshtml b/src/Components/test/testassets/TestServer/Pages/PrerenderedHost.cshtml
index 2d7eacfb9b..7e3a70a899 100644
--- a/src/Components/test/testassets/TestServer/Pages/PrerenderedHost.cshtml
+++ b/src/Components/test/testassets/TestServer/Pages/PrerenderedHost.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @using BasicTestApp.RouterTest
 
 <!DOCTYPE html>
diff --git a/src/Components/test/testassets/TestServer/Pages/_ServerHost.cshtml b/src/Components/test/testassets/TestServer/Pages/_ServerHost.cshtml
index b0ba837af2..f8c48d9261 100644
--- a/src/Components/test/testassets/TestServer/Pages/_ServerHost.cshtml
+++ b/src/Components/test/testassets/TestServer/Pages/_ServerHost.cshtml
@@ -1,4 +1,4 @@
-@page ""
+@page ""
 @addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
 <!DOCTYPE html>
 <html>
diff --git a/src/Components/test/testassets/TestServer/Pages/_ViewImports.cshtml b/src/Components/test/testassets/TestServer/Pages/_ViewImports.cshtml
index 59d4a92b6d..9badfbb16b 100644
--- a/src/Components/test/testassets/TestServer/Pages/_ViewImports.cshtml
+++ b/src/Components/test/testassets/TestServer/Pages/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @using BasicTestApp
 
diff --git a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Pages/Index.cshtml b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Pages/Index.cshtml
index cfae2d6346..4f5ca64978 100644
--- a/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Pages/Index.cshtml
+++ b/src/Identity/ApiAuthorization.IdentityServer/samples/ApiAuthSample/Pages/Index.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @addTagHelper *, Microsoft.AspNetCore.ApiAuthorization.IdentityServer
 
 @model ApiAuthSample.Pages.IndexModel
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/AccessDenied.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/AccessDenied.cshtml
index 3510edef22..017f6ff4d1 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/AccessDenied.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/AccessDenied.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model AccessDeniedModel
 @{
     ViewData["Title"] = "Access denied";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml
index b257bd30be..4fd51cb0e0 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmail.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ConfirmEmailModel
 @{
     ViewData["Title"] = "Confirm email";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmailChange.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmailChange.cshtml
index 83b1df7254..638f9b17be 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmailChange.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ConfirmEmailChange.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ConfirmEmailChangeModel
 @{
     ViewData["Title"] = "Confirm email change";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml
index c2ae93e543..67a31b63e9 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ExternalLogin.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ExternalLoginModel
 @{
     ViewData["Title"] = "Register";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ForgotPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ForgotPassword.cshtml
index f82b7475bc..2ced1baa31 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ForgotPassword.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ForgotPassword.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ForgotPasswordModel
 @{
     ViewData["Title"] = "Forgot your password?";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml
index 444fbd4d0d..a1d9d27d77 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Login.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model LoginModel
 
 @{
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Logout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Logout.cshtml
index 234123aa83..09bdfefb61 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Logout.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Logout.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model LogoutModel
 @{
     ViewData["Title"] = "Log out";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ChangePassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ChangePassword.cshtml
index b089f16254..4fb53617e5 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ChangePassword.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ChangePassword.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ChangePasswordModel
 @{
     ViewData["Title"] = "Change password";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Email.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Email.cshtml
index 53ebd0181b..829e2a8075 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Email.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Email.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model EmailModel
 @{
     ViewData["Title"] = "Manage Email";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml
index 2adbdecf6f..e87248dd3b 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/Index.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model IndexModel
 @{
     ViewData["Title"] = "Profile";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/SetPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/SetPassword.cshtml
index 07bc021d27..eb72f8eb1a 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/SetPassword.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/SetPassword.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model SetPasswordModel
 @{
     ViewData["Title"] = "Set password";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ShowRecoveryCodes.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ShowRecoveryCodes.cshtml
index 33e03ab09c..425b4c2fd5 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ShowRecoveryCodes.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/ShowRecoveryCodes.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ShowRecoveryCodesModel
 @{
     ViewData["Title"] = "Recovery codes";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/TwoFactorAuthentication.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/TwoFactorAuthentication.cshtml
index cbfd6850d5..5492804060 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/TwoFactorAuthentication.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/TwoFactorAuthentication.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @using Microsoft.AspNetCore.Http.Features
 @model TwoFactorAuthenticationModel
 @{
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ManageNav.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ManageNav.cshtml
index cfd16bb22b..1bc99661e7 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ManageNav.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ManageNav.cshtml
@@ -1,4 +1,4 @@
-<ul class="nav nav-pills nav-stacked">
+<ul class="nav nav-pills nav-stacked">
     <li class="@ManageNavPages.IndexNavClass(ViewContext)"><a id="profile" asp-page="./Index">Profile</a></li>
     <li class="@ManageNavPages.EmailNavClass(ViewContext)"><a id="email" asp-page="./Email">Email</a></li>
     <li class="@ManageNavPages.ChangePasswordNavClass(ViewContext)"><a id="change-password" asp-page="./ChangePassword">Password</a></li>
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ViewImports.cshtml
index 94649dd134..d30a34bd0d 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ViewImports.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Manage/_ViewImports.cshtml
@@ -1 +1 @@
-@using Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Manage.Internal
+@using Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Manage.Internal
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Register.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Register.cshtml
index d9bc38dfcd..5a1c5961ac 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Register.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/Register.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model RegisterModel
 @{
     ViewData["Title"] = "Register";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/RegisterConfirmation.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/RegisterConfirmation.cshtml
index a8a27df012..4107942a80 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/RegisterConfirmation.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/RegisterConfirmation.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model RegisterConfirmationModel
 @{
     ViewData["Title"] = "Register confirmation";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResendEmailConfirmation.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResendEmailConfirmation.cshtml
index 910891fb46..64f94cb321 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResendEmailConfirmation.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResendEmailConfirmation.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ResendEmailConfirmationModel
 @{
     ViewData["Title"] = "Resend email confirmation";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResetPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResetPassword.cshtml
index bab0c003fd..6892e4e82a 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResetPassword.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/ResetPassword.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ResetPasswordModel
 @{
     ViewData["Title"] = "Reset password";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/_ViewImports.cshtml
index ec29788292..e61dec0226 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/_ViewImports.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/Account/_ViewImports.cshtml
@@ -1 +1 @@
-@using Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal
+@using Microsoft.AspNetCore.Identity.UI.V3.Pages.Account.Internal
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/_Layout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/_Layout.cshtml
index ae9cb0e5d2..082765957a 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/_Layout.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/_Layout.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Hosting
+@using Microsoft.AspNetCore.Hosting
 @using Microsoft.AspNetCore.Mvc.ViewEngines
 @inject IWebHostEnvironment Environment
 @inject ICompositeViewEngine Engine
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V3/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V3/_ViewImports.cshtml
index c4f4ab5ca7..3b8ef62109 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V3/_ViewImports.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V3/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@namespace Microsoft.AspNetCore.Identity.UI.V3.Pages.Internal
+@namespace Microsoft.AspNetCore.Identity.UI.V3.Pages.Internal
 
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/AccessDenied.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/AccessDenied.cshtml
index 3510edef22..017f6ff4d1 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/AccessDenied.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/AccessDenied.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model AccessDeniedModel
 @{
     ViewData["Title"] = "Access denied";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml
index 0102681e75..26d63e6e0d 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmail.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ConfirmEmailModel
 @{
     ViewData["Title"] = "Confirm email";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmailChange.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmailChange.cshtml
index 83b1df7254..638f9b17be 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmailChange.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ConfirmEmailChange.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ConfirmEmailChangeModel
 @{
     ViewData["Title"] = "Confirm email change";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml
index 40d365fd66..2d7dd0ed2c 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ExternalLogin.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ExternalLoginModel
 @{
     ViewData["Title"] = "Register";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml
index 1ff47265d1..d55361f492 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ForgotPassword.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ForgotPasswordModel
 @{
     ViewData["Title"] = "Forgot your password?";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml
index 60d3605d83..f5157d41fc 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Login.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model LoginModel
 
 @{
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Logout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Logout.cshtml
index 234123aa83..09bdfefb61 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Logout.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Logout.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model LogoutModel
 @{
     ViewData["Title"] = "Log out";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ChangePassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ChangePassword.cshtml
index 40921cc781..e20e095e39 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ChangePassword.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ChangePassword.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ChangePasswordModel
 @{
     ViewData["Title"] = "Change password";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/DeletePersonalData.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/DeletePersonalData.cshtml
index 21eeb186a9..9f6f65b448 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/DeletePersonalData.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/DeletePersonalData.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model DeletePersonalDataModel
 @{
     ViewData["Title"] = "Delete Personal Data";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml
index ea7b2f1180..74338162a5 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Disable2fa.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model Disable2faModel
 @{
     ViewData["Title"] = "Disable two-factor authentication (2FA)";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Email.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Email.cshtml
index 7e9687760c..b7f4c9e7d7 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Email.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Email.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model EmailModel
 @{
     ViewData["Title"] = "Manage Email";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml
index 1c125b18f7..367c0eeff9 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/Index.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model IndexModel
 @{
     ViewData["Title"] = "Profile";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/SetPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/SetPassword.cshtml
index ebb490ef40..c324c12125 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/SetPassword.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/SetPassword.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model SetPasswordModel
 @{
     ViewData["Title"] = "Set password";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml
index 79f9e480ba..b36dca0ad0 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/ShowRecoveryCodes.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ShowRecoveryCodesModel
 @{
     ViewData["Title"] = "Recovery codes";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/TwoFactorAuthentication.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/TwoFactorAuthentication.cshtml
index b07b8c0450..bb542b557a 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/TwoFactorAuthentication.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/TwoFactorAuthentication.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @using Microsoft.AspNetCore.Http.Features
 @model TwoFactorAuthenticationModel
 @{
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ManageNav.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ManageNav.cshtml
index eb79b4001f..4936a2f023 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ManageNav.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ManageNav.cshtml
@@ -1,4 +1,4 @@
-<ul class="nav nav-pills flex-column">
+<ul class="nav nav-pills flex-column">
     <li class="nav-item"><a class="nav-link @ManageNavPages.IndexNavClass(ViewContext)" id="profile" asp-page="./Index">Profile</a></li>
     <li class="nav-item"><a class="nav-link @ManageNavPages.EmailNavClass(ViewContext)" id="email" asp-page="./Email">Email</a></li>
     <li class="nav-item"><a class="nav-link @ManageNavPages.ChangePasswordNavClass(ViewContext)" id="change-password" asp-page="./ChangePassword">Password</a></li>
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ViewImports.cshtml
index 75a5a54daa..79b3b20b6e 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ViewImports.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Manage/_ViewImports.cshtml
@@ -1 +1 @@
-@using Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Manage.Internal
+@using Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Manage.Internal
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Register.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Register.cshtml
index 6b0d44ec8d..faa4a90888 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Register.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/Register.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model RegisterModel
 @{
     ViewData["Title"] = "Register";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/RegisterConfirmation.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/RegisterConfirmation.cshtml
index 4b884db838..d3e7f61e1b 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/RegisterConfirmation.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/RegisterConfirmation.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model RegisterConfirmationModel
 @{
     ViewData["Title"] = "Register confirmation";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResendEmailConfirmation.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResendEmailConfirmation.cshtml
index 16d11e9d8e..8578c23211 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResendEmailConfirmation.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResendEmailConfirmation.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ResendEmailConfirmationModel
 @{
     ViewData["Title"] = "Resend email confirmation";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml
index df51a6a258..147db271e7 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/ResetPassword.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ResetPasswordModel
 @{
     ViewData["Title"] = "Reset password";
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/_ViewImports.cshtml
index b8c45a1c15..cdc597d79b 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/_ViewImports.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/Account/_ViewImports.cshtml
@@ -1 +1 @@
-@using Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal
+@using Microsoft.AspNetCore.Identity.UI.V4.Pages.Account.Internal
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/_Layout.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/_Layout.cshtml
index 557a030edc..fba362e452 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/_Layout.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/_Layout.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Hosting
+@using Microsoft.AspNetCore.Hosting
 @using Microsoft.AspNetCore.Mvc.ViewEngines
 @inject IWebHostEnvironment Environment
 @inject ICompositeViewEngine Engine
diff --git a/src/Identity/UI/src/Areas/Identity/Pages/V4/_ViewImports.cshtml b/src/Identity/UI/src/Areas/Identity/Pages/V4/_ViewImports.cshtml
index 2b4c8b1628..a19b7526e6 100644
--- a/src/Identity/UI/src/Areas/Identity/Pages/V4/_ViewImports.cshtml
+++ b/src/Identity/UI/src/Areas/Identity/Pages/V4/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Internal
+@namespace Microsoft.AspNetCore.Identity.UI.V4.Pages.Internal
 
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml
index 23593ab99a..227ce09141 100644
--- a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml
+++ b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Manage/Index.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model IndexModel
 @{
     ViewData["Title"] = "Profile";
diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml
index 42297ce4d6..ef050ddbcb 100644
--- a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml
+++ b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/Account/Register.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model RegisterModel
 @{
     ViewData["Title"] = "Register";
diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewImports.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewImports.cshtml
index 777abd9e19..33850ab424 100644
--- a/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewImports.cshtml
+++ b/src/Identity/samples/IdentitySample.DefaultUI/Areas/Identity/Pages/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@namespace IdentitySample.DefaultUI
+@namespace IdentitySample.DefaultUI
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml
index 032d9f8f71..73454c6a4e 100644
--- a/src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml
+++ b/src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_Layout.cshtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
     <head>
         <meta charset="utf-8" />
diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml
index 5f363a36bf..fb7b3217e5 100644
--- a/src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml
+++ b/src/Identity/samples/IdentitySample.DefaultUI/Views/Shared/_LoginPartial.cshtml
@@ -1,4 +1,4 @@
-@using IdentitySample.DefaultUI.Data
+@using IdentitySample.DefaultUI.Data
 @inject SignInManager<ApplicationUser> SignInManager
 @inject UserManager<ApplicationUser> UserManager
 
diff --git a/src/Identity/samples/IdentitySample.DefaultUI/Views/_ViewImports.cshtml b/src/Identity/samples/IdentitySample.DefaultUI/Views/_ViewImports.cshtml
index cca35071d9..03f78ed481 100644
--- a/src/Identity/samples/IdentitySample.DefaultUI/Views/_ViewImports.cshtml
+++ b/src/Identity/samples/IdentitySample.DefaultUI/Views/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@using Microsoft.AspNetCore.Identity
+@using Microsoft.AspNetCore.Identity
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Account/Login.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Account/Login.cshtml
index 92e5a4a89a..6f6acb9709 100644
--- a/src/Identity/samples/IdentitySample.Mvc/Views/Account/Login.cshtml
+++ b/src/Identity/samples/IdentitySample.Mvc/Views/Account/Login.cshtml
@@ -1,4 +1,4 @@
-@using System.Collections.Generic
+@using System.Collections.Generic
 @using Microsoft.AspNetCore.Http
 @using Microsoft.AspNetCore.Authentication
 @model LoginViewModel
diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml
index 60c7811fa2..b4c04e69e0 100644
--- a/src/Identity/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml
+++ b/src/Identity/samples/IdentitySample.Mvc/Views/Manage/ManageLogins.cshtml
@@ -1,4 +1,4 @@
-@model ManageLoginsViewModel
+@model ManageLoginsViewModel
 @using Microsoft.AspNetCore.Authentication
 @{
     ViewData["Title"] = "Manage your external logins";
diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml
index 0d65eb7e94..6fdfc649f5 100644
--- a/src/Identity/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml
+++ b/src/Identity/samples/IdentitySample.Mvc/Views/Shared/_Layout.cshtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
     <head>
         <meta charset="utf-8" />
diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml
index 87d35e3aba..8d08593d51 100644
--- a/src/Identity/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml
+++ b/src/Identity/samples/IdentitySample.Mvc/Views/Shared/_LoginPartial.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Identity
+@using Microsoft.AspNetCore.Identity
 @using IdentitySample.Models
 
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/Identity/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml b/src/Identity/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml
index fbba680c39..dc0c3ff7a7 100644
--- a/src/Identity/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml
+++ b/src/Identity/samples/IdentitySample.Mvc/Views/_ViewImports.cshtml
@@ -1,4 +1,4 @@
-@using IdentitySample
+@using IdentitySample
 @using IdentitySample.Models
 @using IdentitySample.Models.AccountViewModels
 @using IdentitySample.Models.ManageViewModels
diff --git a/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml
index bc76a7a323..c6058fdac6 100644
--- a/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml
+++ b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/Shared/_LoginPartial.cshtml
@@ -1,4 +1,4 @@
-<ul class="navbar-nav">
+<ul class="navbar-nav">
     @if (User.Identity.IsAuthenticated)
     {
         <li class="nav-item">
diff --git a/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml
index 313a5b9c33..3b414aaa5b 100644
--- a/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml
+++ b/src/Identity/testassets/Identity.DefaultUI.WebSite/Pages/_ViewImports.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Identity
+@using Microsoft.AspNetCore.Identity
 @using Identity.DefaultUI.WebSite
 @using Identity.DefaultUI.WebSite.Data
 @namespace Identity.DefaultUI.WebSite.Pages
diff --git a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.cshtml b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.cshtml
index b3f77a097e..0467bd8c44 100644
--- a/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.cshtml
+++ b/src/Middleware/Diagnostics/src/DeveloperExceptionPage/Views/ErrorPage.cshtml
@@ -1,4 +1,4 @@
-@using System
+@using System
 @using System.Globalization
 @using System.Linq
 @using System.Net
diff --git a/src/Middleware/Diagnostics/src/WelcomePage/Views/Obsolete/WelcomePage.cshtml b/src/Middleware/Diagnostics/src/WelcomePage/Views/Obsolete/WelcomePage.cshtml
index 9cfb311cbd..c2c1225ed6 100644
--- a/src/Middleware/Diagnostics/src/WelcomePage/Views/Obsolete/WelcomePage.cshtml
+++ b/src/Middleware/Diagnostics/src/WelcomePage/Views/Obsolete/WelcomePage.cshtml
@@ -1,4 +1,4 @@
-@using System
+@using System
 @using Microsoft.AspNetCore.Diagnostics
 @{
     Response.ContentType = "text/html";
diff --git a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Chart.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Chart.cshtml
index 2775261e26..6aed4a5664 100644
--- a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Chart.cshtml
+++ b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Chart.cshtml
@@ -1,4 +1,4 @@
-<h1>Server-rendered chart</h1>
+<h1>Server-rendered chart</h1>
 
 <p>
     This sample demonstrates how arbitrary NPM modules can be invoked from .NET code.
diff --git a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/ES2015Transpilation.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/ES2015Transpilation.cshtml
index bfb35ec5c6..2e28cf67a0 100644
--- a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/ES2015Transpilation.cshtml
+++ b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/ES2015Transpilation.cshtml
@@ -1,4 +1,4 @@
-<h1>ES2015 Transpilation</h1>
+<h1>ES2015 Transpilation</h1>
 
 <p>
     This sample demonstrates a way of intercepting requests for .js files and dynamically transpiling them
diff --git a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Index.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Index.cshtml
index bbdc56316d..a89900803f 100644
--- a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Index.cshtml
+++ b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Index.cshtml
@@ -1,4 +1,4 @@
-<h1>NodeServices examples</h1>
+<h1>NodeServices examples</h1>
 
 <p>
     These examples demonstrate the direct use of the NodeServices package, independently of the usual SPA scenarios.
diff --git a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Prerendering.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Prerendering.cshtml
index bda7d3df0e..3f21ef722a 100644
--- a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Prerendering.cshtml
+++ b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Home/Prerendering.cshtml
@@ -1,4 +1,4 @@
-<h1>Server-side prerendering</h1>
+<h1>Server-side prerendering</h1>
 
 <p>
     This sample demonstrates how you can invoke a JavaScript module that contains
diff --git a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Shared/Error.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Shared/Error.cshtml
index 473b35d6ca..4852442680 100644
--- a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Shared/Error.cshtml
+++ b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/Shared/Error.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
     ViewData["Title"] = "Error";
 }
 
diff --git a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/_ViewImports.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/_ViewImports.cshtml
index 340f37c60e..3d98e6eaca 100644
--- a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/_ViewImports.cshtml
+++ b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@using NodeServicesExamples
+@using NodeServicesExamples
 @addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
diff --git a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/_ViewStart.cshtml b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/_ViewStart.cshtml
index 820a2f6e02..a5f10045db 100644
--- a/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/_ViewStart.cshtml
+++ b/src/Middleware/NodeServices/samples/NodeServicesExamples/Views/_ViewStart.cshtml
@@ -1,3 +1,3 @@
-@{
+@{
     Layout = "_Layout";
 }
diff --git a/src/MusicStore/samples/MusicStore/Pages/PageThatThrows.cshtml b/src/MusicStore/samples/MusicStore/Pages/PageThatThrows.cshtml
index b119553071..c5287d745c 100644
--- a/src/MusicStore/samples/MusicStore/Pages/PageThatThrows.cshtml
+++ b/src/MusicStore/samples/MusicStore/Pages/PageThatThrows.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 @{ throw new InvalidOperationException(); }
diff --git a/src/MusicStore/samples/MusicStore/Views/Shared/_Layout.cshtml b/src/MusicStore/samples/MusicStore/Views/Shared/_Layout.cshtml
index 5723baf71e..81c8c1aace 100644
--- a/src/MusicStore/samples/MusicStore/Views/Shared/_Layout.cshtml
+++ b/src/MusicStore/samples/MusicStore/Views/Shared/_Layout.cshtml
@@ -1,4 +1,4 @@
-@inject IOptions<AppSettings> AppSettings
+@inject IOptions<AppSettings> AppSettings
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/src/MusicStore/samples/MusicStore/Views/Shared/_LoginPartial.cshtml b/src/MusicStore/samples/MusicStore/Views/Shared/_LoginPartial.cshtml
index 25954923fd..20255aec15 100644
--- a/src/MusicStore/samples/MusicStore/Views/Shared/_LoginPartial.cshtml
+++ b/src/MusicStore/samples/MusicStore/Views/Shared/_LoginPartial.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Identity
+@using Microsoft.AspNetCore.Identity
 @using MusicStore.Models
 
 @inject SignInManager<ApplicationUser> SignInManager
diff --git a/src/MusicStore/samples/MusicStore/Views/ShoppingCart/Index.cshtml b/src/MusicStore/samples/MusicStore/Views/ShoppingCart/Index.cshtml
index 4928fff1b2..0cbfb16ac9 100644
--- a/src/MusicStore/samples/MusicStore/Views/ShoppingCart/Index.cshtml
+++ b/src/MusicStore/samples/MusicStore/Views/ShoppingCart/Index.cshtml
@@ -1,4 +1,4 @@
-@model MusicStore.ViewModels.ShoppingCartViewModel
+@model MusicStore.ViewModels.ShoppingCartViewModel
 @inject Microsoft.AspNetCore.Antiforgery.IAntiforgery Xsrf
 @{
     ViewBag.Title = "Shopping Cart";
diff --git a/src/MusicStore/samples/MusicStore/Views/_ViewImports.cshtml b/src/MusicStore/samples/MusicStore/Views/_ViewImports.cshtml
index fa2866b715..41c10061f2 100644
--- a/src/MusicStore/samples/MusicStore/Views/_ViewImports.cshtml
+++ b/src/MusicStore/samples/MusicStore/Views/_ViewImports.cshtml
@@ -1,4 +1,4 @@
-@using MusicStore
+@using MusicStore
 @using MusicStore.Models
 @using Microsoft.Extensions.Options
 @using Microsoft.AspNetCore.Identity
diff --git a/src/Mvc/benchmarkapps/RazorRendering/Pages/Shared/_Layout.cshtml b/src/Mvc/benchmarkapps/RazorRendering/Pages/Shared/_Layout.cshtml
index 6e3fbe8720..6b513a04fb 100644
--- a/src/Mvc/benchmarkapps/RazorRendering/Pages/Shared/_Layout.cshtml
+++ b/src/Mvc/benchmarkapps/RazorRendering/Pages/Shared/_Layout.cshtml
@@ -1,4 +1,4 @@
-@model Pages.Page
+@model Pages.Page
 
 @RenderSection("Subcategories")
 <div class="dialog-title-icon @Model.PageIcon"></div>
diff --git a/src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewImports.cshtml b/src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewImports.cshtml
index b0ad3a90b5..4b9fc93952 100644
--- a/src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewImports.cshtml
+++ b/src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-
+
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
\ No newline at end of file
diff --git a/src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewStart.cshtml b/src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewStart.cshtml
index d641c67f33..1af6e49466 100644
--- a/src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewStart.cshtml
+++ b/src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewStart.cshtml
@@ -1,3 +1,3 @@
-@{
+@{
     Layout = "_Layout";
 }
\ No newline at end of file
diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelloWorld.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelloWorld.cshtml
index 70c379b63f..c0b6da2d2b 100644
--- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelloWorld.cshtml
+++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelloWorld.cshtml
@@ -1 +1 @@
-Hello world
\ No newline at end of file
+Hello world
\ No newline at end of file
diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperDynamic.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperDynamic.cshtml
index 8a476f9847..424c22c13a 100644
--- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperDynamic.cshtml
+++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperDynamic.cshtml
@@ -1,4 +1,4 @@
-@using System;
+@using System;
 @using Microsoft.AspNetCore.Html
 @model System.String
 @{Func<dynamic, IHtmlContent> SomeHelper = @<text>@{
diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperExtensions.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperExtensions.cshtml
index 583a755d1b..cadba50427 100644
--- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperExtensions.cshtml
+++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperExtensions.cshtml
@@ -1,4 +1,4 @@
-@using System;
+@using System;
 @using Microsoft.AspNetCore.Html
 @model System.String
 @{
diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialAsync.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialAsync.cshtml
index d8bc51b756..77052719d5 100644
--- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialAsync.cshtml
+++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialAsync.cshtml
@@ -1,4 +1,4 @@
-@using System;
+@using System;
 @using Microsoft.AspNetCore.Html
 @model System.String
 @for (var i = 0; i < 100; i++)
diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialSync.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialSync.cshtml
index cd17862b20..c2483dab2f 100644
--- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialSync.cshtml
+++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialSync.cshtml
@@ -1,4 +1,4 @@
-@using System;
+@using System;
 @using Microsoft.AspNetCore.Html
 @model System.String
 @for (var i = 0; i < 100; i++)
diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialTagHelper.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialTagHelper.cshtml
index dc76d33bf2..272a647b5b 100644
--- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialTagHelper.cshtml
+++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialTagHelper.cshtml
@@ -1,4 +1,4 @@
-@using System;
+@using System;
 @using Microsoft.AspNetCore.Html
 @model System.String
 @addTagHelper Microsoft.AspNetCore.Mvc.TagHelpers.PartialTagHelper, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartial_Partial.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartial_Partial.cshtml
index da3f4178ae..b0e23063f8 100644
--- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartial_Partial.cshtml
+++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartial_Partial.cshtml
@@ -1,2 +1,2 @@
-@model System.String
+@model System.String
 @Model
\ No newline at end of file
diff --git a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperTyped.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperTyped.cshtml
index 4eec71bbbf..b18ebd96f6 100644
--- a/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperTyped.cshtml
+++ b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperTyped.cshtml
@@ -1,4 +1,4 @@
-@using System;
+@using System;
 @using Microsoft.AspNetCore.Html
 @model System.String
 @{Func<string, IHtmlContent> SomeHelper = @<text>@{
diff --git a/src/Mvc/samples/MvcSandbox/Components/_Imports.razor b/src/Mvc/samples/MvcSandbox/Components/_Imports.razor
index 2b9557ce5a..c3615efc79 100644
--- a/src/Mvc/samples/MvcSandbox/Components/_Imports.razor
+++ b/src/Mvc/samples/MvcSandbox/Components/_Imports.razor
@@ -1 +1 @@
-@using Microsoft.AspNetCore.Components.Web
\ No newline at end of file
+@using Microsoft.AspNetCore.Components.Web
\ No newline at end of file
diff --git a/src/Mvc/samples/MvcSandbox/Pages/_ViewImports.cshtml b/src/Mvc/samples/MvcSandbox/Pages/_ViewImports.cshtml
index f4b9eaae4f..f502b2346c 100644
--- a/src/Mvc/samples/MvcSandbox/Pages/_ViewImports.cshtml
+++ b/src/Mvc/samples/MvcSandbox/Pages/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@namespace MvcSandbox.Pages
+@namespace MvcSandbox.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Mvc/samples/MvcSandbox/Views/_ViewImports.cshtml b/src/Mvc/samples/MvcSandbox/Views/_ViewImports.cshtml
index 96ba4523d1..74538a0483 100644
--- a/src/Mvc/samples/MvcSandbox/Views/_ViewImports.cshtml
+++ b/src/Mvc/samples/MvcSandbox/Views/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@using MvcSandbox
+@using MvcSandbox
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor
index d2d7e9ea66..03c3c8a957 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor
+++ b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/FetchData.razor
@@ -1,6 +1,6 @@
 @using BasicWebSite.Services
 @inject WeatherForecastService ForecastService
-
+@preservewhitespace true
 <h1>Weather forecast</h1>
 
 <p>This component demonstrates fetching data from the server.</p>
@@ -34,7 +34,6 @@ else
         </tbody>
     </table>
 }
-
 @code {
     [Parameter] public DateTime StartDate { get; set; }
 
diff --git a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/_Imports.razor b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/_Imports.razor
index 2b9557ce5a..c3615efc79 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/_Imports.razor
+++ b/src/Mvc/test/WebSites/BasicWebSite/RazorComponents/_Imports.razor
@@ -1 +1 @@
-@using Microsoft.AspNetCore.Components.Web
\ No newline at end of file
+@using Microsoft.AspNetCore.Components.Web
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/AttributeRouteView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/AttributeRouteView.cshtml
index 54be40b404..f439c9d2b3 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/AttributeRouteView.cshtml
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/AttributeRouteView.cshtml
@@ -1 +1 @@
-AttributeRoute - Hello from @ViewBag.Page
+AttributeRoute - Hello from @ViewBag.Page
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/ConventionalRouteView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/ConventionalRouteView.cshtml
index 8a22a765db..80c488fad8 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/ConventionalRouteView.cshtml
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/ConventionalRouteView.cshtml
@@ -1 +1 @@
-ConventionalRoute - Hello from @ViewBag.Page
+ConventionalRoute - Hello from @ViewBag.Page
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataInViewComponent.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataInViewComponent.cshtml
index 7a56ec1d82..1c90ad1ffc 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataInViewComponent.cshtml
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataInViewComponent.cshtml
@@ -1,2 +1,2 @@
-Sample that shows value of ViewDataAttribute being passed to a ViewComponent
+Sample that shows value of ViewDataAttribute being passed to a ViewComponent
 <span class="view-data">@ViewData["Message"]</span>
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataPropertyToView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataPropertyToView.cshtml
index ac08b926f2..401b446f45 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataPropertyToView.cshtml
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataPropertyToView.cshtml
@@ -1,2 +1,2 @@
-@{ Layout = "_Layout"; }
+@{ Layout = "_Layout"; }
 Sample that shows ViewDataAttribute being applied to a controller
diff --git a/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/_Layout.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/_Layout.cshtml
index 64fd714d0f..821e506734 100644
--- a/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/_Layout.cshtml
+++ b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/_Layout.cshtml
@@ -1,4 +1,4 @@
-<html>
+<html>
     <head>
         <title>@ViewData["Title"]</title>
     </head>
diff --git a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Views/Another/InServicesTagHelper.cshtml b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Views/Another/InServicesTagHelper.cshtml
index 562c3573d0..576ba031cc 100644
--- a/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Views/Another/InServicesTagHelper.cshtml
+++ b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Views/Another/InServicesTagHelper.cshtml
@@ -1,2 +1,2 @@
-@addTagHelper *, ControllersFromServicesWebSite
+@addTagHelper *, ControllersFromServicesWebSite
 <inservices></inservices>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/RuntimeError.cshtml b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/RuntimeError.cshtml
index d476445cdb..6c50696c11 100644
--- a/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/RuntimeError.cshtml
+++ b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/RuntimeError.cshtml
@@ -1,3 +1,3 @@
-@{
+@{
   throw new Exception("Error from view");
 }
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithFallback.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithFallback.cshtml
index fc6b995ab1..3602bf0ddd 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithFallback.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithFallback.cshtml
@@ -1,3 +1,3 @@
-@page
+@page
 
 <partial name="_DoesNotExist" fallback-name="./_Fallback" />
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithOptional.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithOptional.cshtml
index c3c8ecd2cb..3c5bfa7d4e 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithOptional.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithOptional.cshtml
@@ -1,3 +1,3 @@
-@page
+@page
 
 <div id="content"><partial name="_DoesNotExist" optional="true" /></div>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/_ViewImports.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/_ViewImports.cshtml
index a757b413b9..afa82bbf24 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/_ViewImports.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/_ViewImports.cshtml
@@ -1 +1 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Pages/CacheTagHelper_VaryByCulture.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Pages/CacheTagHelper_VaryByCulture.cshtml
index 97cb7f7d52..ef78fca760 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Pages/CacheTagHelper_VaryByCulture.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Pages/CacheTagHelper_VaryByCulture.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @addTagHelper *, HtmlGenerationWebSite
 @using System.Globalization
 @functions
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Pages/_ViewImports.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Pages/_ViewImports.cshtml
index a757b413b9..afa82bbf24 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Pages/_ViewImports.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Pages/_ViewImports.cshtml
@@ -1 +1 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml
index 3abf0965a8..9877a277d4 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.Extensions.Caching.Memory
+@using Microsoft.Extensions.Caching.Memory
 <cache enabled="ViewBag.IsEnabled">
     Deal percentage is @ViewBag.ProductDealPercentage
 </cache>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Details.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Details.cshtml
index a224f45d1e..8fc80325d7 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Details.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Details.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.Extensions.Caching.Memory
+@using Microsoft.Extensions.Caching.Memory
 <cache expires-after="TimeSpan.FromSeconds(1)" priority="CacheItemPriority.Low">
 Cached content for @ViewBag.ProductId
 </cache>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml
index a757b413b9..afa82bbf24 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml
@@ -1 +1 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/CreateWarehouse.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/CreateWarehouse.cshtml
index c2a94d265e..0faff09245 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/CreateWarehouse.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/CreateWarehouse.cshtml
@@ -1,4 +1,4 @@
-@model HtmlGenerationWebSite.Models.Warehouse
+@model HtmlGenerationWebSite.Models.Warehouse
 
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditWarehouse.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditWarehouse.cshtml
index 74d67cb003..088af3d045 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditWarehouse.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditWarehouse.cshtml
@@ -1,4 +1,4 @@
-@model HtmlGenerationWebSite.Models.Warehouse
+@model HtmlGenerationWebSite.Models.Warehouse
 
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/Employee.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/Employee.cshtml
index c052f7a9eb..c7711122d2 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/Employee.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/Employee.cshtml
@@ -1,4 +1,4 @@
-@model HtmlGenerationWebSite.Models.Employee
+@model HtmlGenerationWebSite.Models.Employee
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
 <div>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingTagHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingTagHelpers.cshtml
index dd2a199b5f..c73799f526 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingTagHelpers.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingTagHelpers.cshtml
@@ -1,4 +1,4 @@
-@using HtmlGenerationWebSite.Models
+@using HtmlGenerationWebSite.Models
 @model Gender
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 <input asp-for="@Model" type="radio" value="Male" /> Male
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Environment.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Environment.cshtml
index 5275dcfc7f..f616ab30cf 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Environment.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Environment.cshtml
@@ -1,4 +1,4 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
 <!doctype html>
 <html>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml
index 93db6801a8..cde1f3a544 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.Extensions.DependencyInjection
+@using Microsoft.Extensions.DependencyInjection
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
 <html>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml
index f0865e1f95..e5adad5185 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml
@@ -1,4 +1,4 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
 <!doctype html>
 <html>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml
index 24830788f5..c3f68562e1 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
     ViewBag.Title = "Home Page";
 }
 
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml
index daf3f7424b..6ffa7e4aac 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml
@@ -1,4 +1,4 @@
-@using HtmlGenerationWebSite.Models
+@using HtmlGenerationWebSite.Models
 @model Folder
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/PartialTagHelperWithoutModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/PartialTagHelperWithoutModel.cshtml
index 5074a5280f..697fc0bdd1 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/PartialTagHelperWithoutModel.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/PartialTagHelperWithoutModel.cshtml
@@ -1,2 +1,2 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 PartialTagHelperWithoutModel: <partial name="../Shared/_Partial" />
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Product.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Product.cshtml
index 7d14c561d8..4e68bd99d2 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Product.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Product.cshtml
@@ -1,4 +1,4 @@
-@model HtmlGenerationWebSite.Models.Product
+@model HtmlGenerationWebSite.Models.Product
 
 @{
     ViewBag.Title = "Product Page";
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductList.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductList.cshtml
index 8ba2a25f97..96e978faa6 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductList.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductList.cshtml
@@ -1,4 +1,4 @@
-@using HtmlGenerationWebSite.Models
+@using HtmlGenerationWebSite.Models
 @model IEnumerable<Product>
 
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/StatusMessage.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/StatusMessage.cshtml
index 68576bedd7..0579ad9aee 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/StatusMessage.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/StatusMessage.cshtml
@@ -1,4 +1,4 @@
-@using HtmlGenerationWebSite.Models
+@using HtmlGenerationWebSite.Models
 @model StatusMessageModel
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Warehouse.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Warehouse.cshtml
index 2a039cd8dd..b96db1f60e 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Warehouse.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Warehouse.cshtml
@@ -1,4 +1,4 @@
-@model HtmlGenerationWebSite.Models.Warehouse
+@model HtmlGenerationWebSite.Models.Warehouse
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
 <h3>@Html.DisplayFor(m => m.City)</h3>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_EmployeePartial.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_EmployeePartial.cshtml
index d15ee345e3..8c8eb60387 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_EmployeePartial.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_EmployeePartial.cshtml
@@ -1,4 +1,4 @@
-@model HtmlGenerationWebSite.Models.Employee
+@model HtmlGenerationWebSite.Models.Employee
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
 <div>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductPartial.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductPartial.cshtml
index a71025b7c1..9d0a551b19 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductPartial.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductPartial.cshtml
@@ -1,4 +1,4 @@
-@model HtmlGenerationWebSite.Models.Product
+@model HtmlGenerationWebSite.Models.Product
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
 <div>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductRecommendations.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductRecommendations.cshtml
index 62427670ea..bc8eb06acb 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductRecommendations.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductRecommendations.cshtml
@@ -1,4 +1,4 @@
-@using HtmlGenerationWebSite.Models
+@using HtmlGenerationWebSite.Models
 @model ProductRecommendations
 
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_StatusMessagePartial.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_StatusMessagePartial.cshtml
index a7ff9eec3f..8ed56bad81 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_StatusMessagePartial.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_StatusMessagePartial.cshtml
@@ -1,2 +1,2 @@
-@model string
+@model string
 <div class="banner">@Model</div>
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithHtmlHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithHtmlHelpers.cshtml
index f192c5d84f..98ef4afe9e 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithHtmlHelpers.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithHtmlHelpers.cshtml
@@ -1,4 +1,4 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @using HtmlGenerationWebSite.Models
 @model WeirdModel
 
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithTagHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithTagHelpers.cshtml
index 8bf8575cdc..2200718740 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithTagHelpers.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithTagHelpers.cshtml
@@ -1,4 +1,4 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @using HtmlGenerationWebSite.Models
 @model WeirdModel
 
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Splash/Default.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Splash/Default.cshtml
index 5e77c7a1ca..c52294856d 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Splash/Default.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Splash/Default.cshtml
@@ -1,4 +1,4 @@
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @model string
 Locations closest to your locale:
 <cache vary-by-header="Locale">
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Customer.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Customer.cshtml
index 47da58f35a..0fcb9fea51 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Customer.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Customer.cshtml
@@ -1,4 +1,4 @@
-@model HtmlGenerationWebSite.Models.Customer
+@model HtmlGenerationWebSite.Models.Customer
 
 @{
     ViewBag.Title = "Customer Page";
diff --git a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/_Partial.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/_Partial.cshtml
index fcdc0458e2..ead835c66f 100644
--- a/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/_Partial.cshtml
+++ b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/_Partial.cshtml
@@ -1 +1 @@
-Hello from partial
+Hello from partial
diff --git a/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Overriden.cshtml b/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Overriden.cshtml
index 297cb03980..2e6d42e7ba 100644
--- a/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Overriden.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Overriden.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 @{ throw new Exception("This page should be overriden by the application."); }
diff --git a/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Served.cshtml b/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Served.cshtml
index b58fb3c243..26fa1d0522 100644
--- a/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Served.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Served.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 This page is served from RazorPagesClassLibrary
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/About.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/About.cshtml
index 41bcf05b63..bf26eeff8d 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/About.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/About.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 Hello from a page in Accounts area
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/RenderPartials.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/RenderPartials.cshtml
index f46c0eaac6..834dea038d 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/RenderPartials.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/RenderPartials.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @{
     Layout = "_GlobalLayout";
 }
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/_PartialInManage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/_PartialInManage.cshtml
index 8c48fa2a89..d9acf8cfa8 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/_PartialInManage.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/_PartialInManage.cshtml
@@ -1 +1 @@
-Partial in /Areas/Accounts/Pages/Manage/
+Partial in /Areas/Accounts/Pages/Manage/
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithLinks.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithLinks.cshtml
index 724d540236..584e503d57 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithLinks.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithLinks.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 <a asp-page="/Manage/RenderPartials">Link inside area</a>
 <a asp-page="/List" asp-area="Products" asp-route-sort="old" asp-route-top="20">Link to external area</a>
 <a asp-controller="Home" asp-action="Index">Link to area action</a>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithRouteTemplate.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithRouteTemplate.cshtml
index 67da977644..6af92ad62f 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithRouteTemplate.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithRouteTemplate.cshtml
@@ -1,4 +1,4 @@
-@page "{id}"
+@page "{id}"
 @functions
 {
     [BindProperty(SupportsGet = true)]
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RelativeLinks/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RelativeLinks/Index.cshtml
index 07c7ea0ec1..9ad87b86ed 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RelativeLinks/Index.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RelativeLinks/Index.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 <a asp-page="../PageWithRouteTemplate" asp-route-id="1">Parent directory</a>
 <a asp-page="../Manage/RenderPartials">Sibling directory</a>
 <a asp-page="../List" asp-area="Products">Go back to root of different area</a>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/AllowAnonymous.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/AllowAnonymous.cshtml
index 221402ef5c..d984ec19fc 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/AllowAnonymous.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/AllowAnonymous.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 Hello from AllowAnonymous
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/Index.cshtml
index 3749762261..1e15e8f65d 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/Index.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/Index.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 @{ throw new Exception("This should not be rendered."); }
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/_PartialInAreaPagesRoot.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/_PartialInAreaPagesRoot.cshtml
index 763bcc1103..26ae626ed9 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/_PartialInAreaPagesRoot.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/_PartialInAreaPagesRoot.cshtml
@@ -1 +1 @@
-Partial in /Areas/Accounts/Pages/
+Partial in /Areas/Accounts/Pages/
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Home/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Home/Index.cshtml
index c59d1afadc..d021161085 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Home/Index.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Home/Index.cshtml
@@ -1,3 +1,3 @@
-<a asp-page="/PageWithRouteTemplate" asp-route-id="10">Link to page inside current area</a>
+<a asp-page="/PageWithRouteTemplate" asp-route-id="10">Link to page inside current area</a>
 <a asp-area="Products" asp-page="/List" asp-route-sort="best">Link to page in different area</a>
 <a asp-page="/Routes/Sibling">Link to page outside area</a>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Shared/_PartialInAreasSharedViews.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Shared/_PartialInAreasSharedViews.cshtml
index 544da589c2..c3bbb6694e 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Shared/_PartialInAreasSharedViews.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Shared/_PartialInAreasSharedViews.cshtml
@@ -1 +1 @@
-Partial in /Areas/Accounts/Views/Shared/
+Partial in /Areas/Accounts/Views/Shared/
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/_ViewImports.cshtml
index aaf882de29..d36377940a 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/_ViewImports.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/_ViewImports.cshtml
@@ -1 +1 @@
-@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
+@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Products/Pages/List.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Products/Pages/List.cshtml
index a860f502be..2016d9c26c 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Products/Pages/List.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Products/Pages/List.cshtml
@@ -1 +1 @@
-@page "{sort?}/{top?}"
\ No newline at end of file
+@page "{sort?}/{top?}"
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/InjectedPageProperties.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/InjectedPageProperties.cshtml
index ed07662bce..d57243c773 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/InjectedPageProperties.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/InjectedPageProperties.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 
 @Url.GetType()
 @Html.GetType()
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelAsFilter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelAsFilter.cshtml
index 61d5fce1a9..bf889ee647 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelAsFilter.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelAsFilter.cshtml
@@ -1,3 +1,3 @@
-@page "{handler?}"
+@page "{handler?}"
 @model RazorPagesWebSite.ModelAsFilter
 @Model.Message
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cshtml
index 05809eaac4..a4a954b6aa 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model RazorPagesWebSite.ModelWithPageFilter
 
 @Model.Message
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cshtml
index 5883b6056f..a74503f701 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model RazorPagesWebSite.ModelWithResponseCache
 
 @Model.Message
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Edit.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Edit.cshtml
index a7b9c2c62e..6ac2721c37 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Edit.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Edit.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @functions
 {
     public void OnPost()
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/AntiforgeryDefault.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/AntiforgeryDefault.cshtml
index 9e36e83e2a..f9ba75bce0 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/AntiforgeryDefault.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/AntiforgeryDefault.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model AntiforgeryDefaultModel
 <form method="post">
     
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/IgnoreAntiforgery.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/IgnoreAntiforgery.cshtml
index 336e79a803..c571541f94 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/IgnoreAntiforgery.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/IgnoreAntiforgery.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model IgnoreAntiforgeryModel
 <form method="post">
     
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/_ViewImports.cshtml
index aaf882de29..d36377940a 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/_ViewImports.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/_ViewImports.cshtml
@@ -1 +1 @@
-@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
+@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ClassLibraryPages/Overriden.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ClassLibraryPages/Overriden.cshtml
index 18267bd84c..a9c011ea4d 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ClassLibraryPages/Overriden.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ClassLibraryPages/Overriden.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 This page is overriden by RazorPagesWebSite
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousViaModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousViaModel.cshtml
index a5f469d689..20e863b043 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousViaModel.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousViaModel.cshtml
@@ -1,3 +1,3 @@
-@page
+@page
 @model AnonymousModel
 Hello from Anonymous
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/Page.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/Page.cshtml
index 5bdc8374e0..bbce5616da 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/Page.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/Page.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 @GetType().BaseType.FullName
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cshtml
index 9b6bfb0727..c83c515885 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cshtml
@@ -1,3 +1,3 @@
-@page
+@page
 @model PageWithModel
 @GetType().BaseType.FullName
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewImports.cshtml
index 8085b8cd3f..652f4172f6 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewImports.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@using RazorPagesWebSite
+@using RazorPagesWebSite
 @inherits CustomPageBase
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewStart.cshtml
index dd100cf854..7e0b3a0288 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewStart.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewStart.cshtml
@@ -1 +1 @@
-@{ Layout = "../Shared/_CustomBaseTypeLayout"; }
\ No newline at end of file
+@{ Layout = "../Shared/_CustomBaseTypeLayout"; }
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomPrefix/Custom.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomPrefix/Custom.cshtml
index ace20dc097..1a15753596 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomPrefix/Custom.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomPrefix/Custom.cshtml
@@ -1,3 +1,3 @@
-@page "~/like-totally-custom"
+@page "~/like-totally-custom"
 
 <p>Hey, it's Mr. totally custom here!</p>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.cshtml
index 91c87f0d1a..351b25c7d1 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.cshtml
@@ -1,3 +1,3 @@
-@page
+@page
 @inject Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer Localizer
 @Localizer["Hello"]
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cshtml
index fe46ea0520..727dca14a5 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model PageWithModel
 @inject Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer Localizer
 @Localizer["Hello"]
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ModelWithAuthFilter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ModelWithAuthFilter.cshtml
index 8862a69efa..dad4f57a3c 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ModelWithAuthFilter.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ModelWithAuthFilter.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model RazorPagesWebSite.ModelWithAuthFilter
 
 Can't see me
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/NotTheRoot.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/NotTheRoot.cshtml
index f919c9d628..448746e1a8 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/NotTheRoot.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/NotTheRoot.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 Hello from NotTheRoot
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cshtml
index 14b6136e32..edbf20fede 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model BindPropertiesOnModel
 
 Property1 = @Model.Property1, Property2 = @Model.Property2,
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cshtml
index eb13d32677..1f8622268d 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cshtml
@@ -1,3 +1,3 @@
-@page
+@page
 @model BindPropertiesWithSupportsGetOnModel
 @Model.Property
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Index.cshtml
index d1e39427c6..98b2013666 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Index.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Index.cshtml
@@ -1,4 +1,4 @@
-@page "{handler?}"
+@page "{handler?}"
 @functions
 {
     public IActionResult OnGet() => RedirectToPage();
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Redirect.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Redirect.cshtml
index 71ebf6dd23..8afc3d5904 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Redirect.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Redirect.cshtml
@@ -1 +1 @@
-@page "{id:int}"
+@page "{id:int}"
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromHandler.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromHandler.cshtml
index 3ced81afa7..86583bfc1d 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromHandler.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromHandler.cshtml
@@ -1,4 +1,4 @@
-@page "{handler?}/{id:int?}"
+@page "{handler?}/{id:int?}"
 @functions
 {
     public IActionResult OnGetRedirectToPage(int id)
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cshtml
index b3631bd5fd..5481fac254 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 @model RazorPagesWebSite.RedirectFromModel
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromPage.cshtml
index 4c44dc4690..7a9f93c614 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromPage.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromPage.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @functions
 {
     public IActionResult OnGet() => RedirectToPage("/Pages/Redirects/Redirect", new { id = 10});
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSelf.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSelf.cshtml
index bc597309d0..919ead937c 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSelf.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSelf.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @functions
 {
     public IActionResult OnPost(int value) => RedirectToPage(new { user = value });
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSibling.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSibling.cshtml
index f0935c53db..ec240d81c4 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSibling.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSibling.cshtml
@@ -1,4 +1,4 @@
-@page "{handler?}"
+@page "{handler?}"
 @functions
 {
     public IActionResult OnGetRedirectToIndex() => RedirectToPage("Index");
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/SubDir/SubDirPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/SubDir/SubDirPage.cshtml
index dce99a3fbc..010bf8732a 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/SubDir/SubDirPage.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/SubDir/SubDirPage.cshtml
@@ -1 +1 @@
-@page
+@page
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/RouteUsingDefaultName.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/RouteUsingDefaultName.cshtml
index 3e55b34655..72a7e4e7be 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/RouteUsingDefaultName.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/RouteUsingDefaultName.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 <a asp-page="/Routes/Sibling" asp-route-id="10">Link</a>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/Sibling.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/Sibling.cshtml
index 290bb82e89..173766c677 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/Sibling.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/Sibling.cshtml
@@ -1 +1 @@
-@page "{id?}"
+@page "{id?}"
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/_ViewImports.cshtml
index be13c8c370..d86bab4ae9 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/_ViewImports.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/_ViewImports.cshtml
@@ -1 +1 @@
-@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
\ No newline at end of file
+@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml
index 99cd541a61..048f1d9baf 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 @(await Html.PartialAsync("_FileInShared"))
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_CustomBaseTypeLayout.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_CustomBaseTypeLayout.cshtml
index fd08733813..b6cd2f2562 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_CustomBaseTypeLayout.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_CustomBaseTypeLayout.cshtml
@@ -1 +1 @@
-<custom-base-type-layout>@RenderBody()</custom-base-type-layout>
+<custom-base-type-layout>@RenderBody()</custom-base-type-layout>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_FileInShared.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_FileInShared.cshtml
index 72df466583..6c1077f405 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_FileInShared.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_FileInShared.cshtml
@@ -1 +1 @@
-Hello from /Pages/Shared/
+Hello from /Pages/Shared/
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/CrossPost.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/CrossPost.cshtml
index 0a6eefee4c..db6617f199 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/CrossPost.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/CrossPost.cshtml
@@ -1,4 +1,4 @@
-@page "{id:int?}"
+@page "{id:int?}"
 
 <form method="POST" asp-page="/TagHelper/SelfPost" asp-route-id="10" asp-antiforgery="false"></form>
 <form method="POST" asp-page="PostWithHandler" asp-page-handler="Delete"  asp-route-id="10" asp-antiforgery="false"></form>
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/FormAction.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/FormAction.cshtml
index 4042ece3fe..179ea23238 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/FormAction.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/FormAction.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 <button asp-page="/TagHelper/CrossPost" asp-route-id="10" />
 <input type="submit" asp-page="/TagHelper/CrossPost" asp-route-id="10" />
 <input type="image" asp-page="/TagHelper/CrossPost" asp-route-id="10" />
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PathTraversalLinks.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PathTraversalLinks.cshtml
index 456deacfaf..162d6b84db 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PathTraversalLinks.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PathTraversalLinks.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 
 <form method="post" asp-page="./SubDirectoryLinks" asp-antiforgery="false"></form>
 <form method="post" asp-page="../../HelloWorld" asp-antiforgery="false"></form>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PostWithHandler.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PostWithHandler.cshtml
index 39ef8f5c4a..060e1be7be 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PostWithHandler.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PostWithHandler.cshtml
@@ -1,4 +1,4 @@
-@page "{handler?}/{id?}"
+@page "{handler?}/{id?}"
 
 @functions
 {
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SelfPost.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SelfPost.cshtml
index ae3decd1d4..6b6517aef6 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SelfPost.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SelfPost.cshtml
@@ -1,4 +1,4 @@
-@page "{id:int?}"
+@page "{id:int?}"
 
 <form method="POST" asp-page="" asp-route-id="10">
 <input type="submit" value="Submit" />
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SiblingLinks.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SiblingLinks.cshtml
index ced329ee26..465a37cfae 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SiblingLinks.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SiblingLinks.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 
 <form method="post" asp-page="CrossPost" asp-antiforgery="false"></form>
 <a asp-page="SelfPost" asp-route-id="12" />
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDir/SubDirPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDir/SubDirPage.cshtml
index b66d4d4562..a482a62d2e 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDir/SubDirPage.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDir/SubDirPage.cshtml
@@ -1,2 +1,2 @@
-@page "{id?}"
+@page "{id?}"
  
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDirectoryLinks.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDirectoryLinks.cshtml
index 2ee9fef587..c3f76f8c96 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDirectoryLinks.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDirectoryLinks.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 
 <form method="post" asp-page="SubDir/SubDirPage" asp-antiforgery="false"></form>
 <a asp-page="SubDir/SubDirPage" asp-route-id="12" />
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/_ViewImports.cshtml
index be13c8c370..d86bab4ae9 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/_ViewImports.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/_ViewImports.cshtml
@@ -1 +1 @@
-@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
\ No newline at end of file
+@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageHandlerWithValidation.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageHandlerWithValidation.cshtml
index 0236c765ac..8a99abcf8e 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageHandlerWithValidation.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageHandlerWithValidation.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @using System.ComponentModel.DataAnnotations
 @functions
 {
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithCompareValidation.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithCompareValidation.cshtml
index 2e4d157977..a8efd2541c 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithCompareValidation.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithCompareValidation.cshtml
@@ -1,3 +1,3 @@
-@page
+@page
 @model PageWithCompareValidation
 <div asp-validation-summary="All"></div>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cshtml
index 845495ea59..a1638ee456 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cshtml
@@ -1,3 +1,3 @@
-@page
+@page
 @model PageWithValidation
 <div asp-validation-summary="All"></div>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/_ViewImports.cshtml
index aaf882de29..d36377940a 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/_ViewImports.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/_ViewImports.cshtml
@@ -1 +1 @@
-@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
+@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cshtml
index 119fbf7b6e..60f8fb3709 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ViewDataInPage
 @{
     Layout = "_Layout";
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPageWithoutModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPageWithoutModel.cshtml
index b64538b461..ed54169870 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPageWithoutModel.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPageWithoutModel.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @{
     Layout = "_Layout";
 }
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/Index.cshtml
index 683a1631e8..5f071298c3 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/Index.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/Index.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @namespace RazorPagesWebSite.ViewDataSetInViewStart
 @model Index
 @{
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/_Layout.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/_Layout.cshtml
index 6b3bb02e51..5cf801c8a5 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/_Layout.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/_Layout.cshtml
@@ -1,4 +1,4 @@
-@RenderBody()
+@RenderBody()
 <span id="valuefromviewstart">@ViewData["ValueFromViewStart"]</span>
 <span id="valuefrompage">@ViewData["ValueFromPage"]</span>
 <span id="valuefrompagemodel">@ViewData["ValueFromPageModel"]</span>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cshtml
index 82b4340edb..66575ab4e3 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 @model ViewDataToViewComponentPage
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_Layout.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_Layout.cshtml
index a9a9d31edf..a638a3592f 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_Layout.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_Layout.cshtml
@@ -1,4 +1,4 @@
-<html>
+<html>
     <head>
         <meta name="description" content="@ViewData["Description"]" />
         <meta name="keywords" content="@ViewData["Keywords"]" />
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_ViewImports.cshtml
index aaf882de29..d36377940a 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_ViewImports.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_ViewImports.cshtml
@@ -1 +1 @@
-@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
+@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/ViewStartAtRoot.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/ViewStartAtRoot.cshtml
index 83faae9562..0a4c5cefa8 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/ViewStartAtRoot.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/ViewStartAtRoot.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 Hello from page
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_FileInShared.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_FileInShared.cshtml
index 0c110be233..2c6c14c542 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_FileInShared.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_FileInShared.cshtml
@@ -1 +1 @@
-@{ throw new Exception("This file should not be processed"); }
\ No newline at end of file
+@{ throw new Exception("This file should not be processed"); }
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_GlobalLayout.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_GlobalLayout.cshtml
index 3f9d21e30c..2c141d4070 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_GlobalLayout.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_GlobalLayout.cshtml
@@ -1,2 +1,2 @@
-Layout in /Views/Shared
+Layout in /Views/Shared
 @RenderBody()
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/_ViewStart.cshtml
index 29ff986af7..d0a1696850 100644
--- a/src/Mvc/test/WebSites/RazorPagesWebSite/_ViewStart.cshtml
+++ b/src/Mvc/test/WebSites/RazorPagesWebSite/_ViewStart.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Mvc.RazorPages
+@using Microsoft.AspNetCore.Mvc.RazorPages
 @if (ViewContext.ActionDescriptor is PageActionDescriptor actionDescriptor && actionDescriptor.ViewEnginePath == "/WithViewStart/ViewStartAtRoot")
 {
 <text>Hello from _ViewStart at root
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_Layout.cshtml
index 0c110be233..2c6c14c542 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_Layout.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_Layout.cshtml
@@ -1 +1 @@
-@{ throw new Exception("This file should not be processed"); }
\ No newline at end of file
+@{ throw new Exception("This file should not be processed"); }
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_SharedFromPages.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_SharedFromPages.cshtml
index eebf127144..1de0aaaf46 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_SharedFromPages.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_SharedFromPages.cshtml
@@ -1 +1 @@
-Hello from Pages/Shared
+Hello from Pages/Shared
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml
index 2685d9023f..66ebafb064 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
   ViewData["back-slash"] = "true";
   Layout = "_Layout";
 }
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_BackSlashPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_BackSlashPartial.cshtml
index 8bfc4e8000..e6cc1399e9 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_BackSlashPartial.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_BackSlashPartial.cshtml
@@ -1 +1 @@
-Partial
\ No newline at end of file
+Partial
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_Layout.cshtml
index 6bba921339..e0c3e4c9b0 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_Layout.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_Layout.cshtml
@@ -1,2 +1,2 @@
-Layout
+Layout
 @RenderBody()
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/_ViewStart.cshtml
index 4719f448aa..f9a46cb429 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/_ViewStart.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/_ViewStart.cshtml
@@ -1,3 +1,3 @@
-@{
+@{
     Layout = "~/Views/NestedViewStarts/NestedViewStarts/Layout.cshtml";
 }
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml
index a02bd71da0..574762c34a 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml
@@ -1 +1 @@
-@(await Html.PartialAsync("_SharedFromPages"))
+@(await Html.PartialAsync("_SharedFromPages"))
diff --git a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml
index 3be0f94e1d..7877e4120c 100644
--- a/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml
+++ b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml
@@ -1,4 +1,4 @@
-@inject FrameworkSpecificHelper MyHelper
+@inject FrameworkSpecificHelper MyHelper
 @{
     string value =
 #if NETCOREAPP2_0_CUSTOM_DEFINE || NETCOREAPP2_1_CUSTOM_DEFINE
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Pages/AllowAnonymousPageViaConvention.cshtml b/src/Mvc/test/WebSites/SecurityWebSite/Pages/AllowAnonymousPageViaConvention.cshtml
index 8f8b6cb30a..290d79b131 100644
--- a/src/Mvc/test/WebSites/SecurityWebSite/Pages/AllowAnonymousPageViaConvention.cshtml
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Pages/AllowAnonymousPageViaConvention.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 @model AllowAnonymousPageViaConvention
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Pages/AllowAnonymousPageViaModel.cshtml b/src/Mvc/test/WebSites/SecurityWebSite/Pages/AllowAnonymousPageViaModel.cshtml
index b09c8131d9..ed6e331cfc 100644
--- a/src/Mvc/test/WebSites/SecurityWebSite/Pages/AllowAnonymousPageViaModel.cshtml
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Pages/AllowAnonymousPageViaModel.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 @model AllowAnonymousPageViaModel
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Pages/AuthorizePageViaConvention.cshtml b/src/Mvc/test/WebSites/SecurityWebSite/Pages/AuthorizePageViaConvention.cshtml
index 4081393374..8a44633260 100644
--- a/src/Mvc/test/WebSites/SecurityWebSite/Pages/AuthorizePageViaConvention.cshtml
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Pages/AuthorizePageViaConvention.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 @model AuthorizePageViaConvention
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Pages/AuthorizePageViaModel.cshtml b/src/Mvc/test/WebSites/SecurityWebSite/Pages/AuthorizePageViaModel.cshtml
index 8da44d60d8..2638189f54 100644
--- a/src/Mvc/test/WebSites/SecurityWebSite/Pages/AuthorizePageViaModel.cshtml
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Pages/AuthorizePageViaModel.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 @model AuthorizePageViaModel
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Pages/PagesHome.cshtml b/src/Mvc/test/WebSites/SecurityWebSite/Pages/PagesHome.cshtml
index e8a33ba88f..6674c35aef 100644
--- a/src/Mvc/test/WebSites/SecurityWebSite/Pages/PagesHome.cshtml
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Pages/PagesHome.cshtml
@@ -1,2 +1,2 @@
-@page
+@page
 Hello from PagesHome
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/SecurityWebSite/Pages/_ViewImports.cshtml b/src/Mvc/test/WebSites/SecurityWebSite/Pages/_ViewImports.cshtml
index 22e61baa9f..eb2aef3baa 100644
--- a/src/Mvc/test/WebSites/SecurityWebSite/Pages/_ViewImports.cshtml
+++ b/src/Mvc/test/WebSites/SecurityWebSite/Pages/_ViewImports.cshtml
@@ -1 +1 @@
-@namespace SecurityWebSite
\ No newline at end of file
+@namespace SecurityWebSite
\ No newline at end of file
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml
index 21aaa01baa..afccace751 100644
--- a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml
@@ -1,4 +1,4 @@
-@model TagHelpersWebSite.Models.Employee
+@model TagHelpersWebSite.Models.Employee
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 
 @{
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Details.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Details.cshtml
index 2393a00652..ea4ef1b60c 100644
--- a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Details.cshtml
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Details.cshtml
@@ -1,4 +1,4 @@
-@model TagHelpersWebSite.Models.Employee
+@model TagHelpersWebSite.Models.Employee
 @{
     Layout = null;
 }
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml
index 77699bd939..52d62c30ee 100644
--- a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml
@@ -1,4 +1,4 @@
-@using TagHelpersWebSite.Models
+@using TagHelpersWebSite.Models
 @using Microsoft.AspNetCore.Mvc.Razor
 
 @model WebsiteContext
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/_ViewImports.cshtml
index f6cd3d1848..9a07188acb 100644
--- a/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/_ViewImports.cshtml
+++ b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/_ViewImports.cshtml
@@ -1 +1 @@
-@removeTagHelper *, Microsoft.AspNetCore.Mvc.Razor
\ No newline at end of file
+@removeTagHelper *, Microsoft.AspNetCore.Mvc.Razor
\ No newline at end of file
diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs
index a63c8c4dfd..decd986856 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs
@@ -330,6 +330,7 @@ namespace Templates.Test
         }
 
         [Fact]
+        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/23639")]
         public async Task BlazorWasmStandaloneTemplate_IndividualAuth_Works()
         {
             var project = await ProjectFactory.GetOrCreateProject("blazorstandaloneindividual", Output);
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.editorconfig b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.editorconfig
index 6e87a003da..934f2fe842 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.editorconfig
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/.editorconfig
@@ -11,3 +11,6 @@ trim_trailing_whitespace = true
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false
+
+[*.{razor,cshtml}]
+charset = utf-8-bom
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Pages/_ViewImports.cshtml b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Pages/_ViewImports.cshtml
index 83b0afbea3..4d1205a924 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Pages/_ViewImports.cshtml
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/Pages/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using Company.WebApplication1
+@using Company.WebApplication1
 @namespace Company.WebApplication1.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/_ViewImports.cshtml b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/_ViewImports.cshtml
index 83b0afbea3..4d1205a924 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/_ViewImports.cshtml
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/Pages/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using Company.WebApplication1
+@using Company.WebApplication1
 @namespace Company.WebApplication1.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Pages/_ViewImports.cshtml b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Pages/_ViewImports.cshtml
index 83b0afbea3..4d1205a924 100644
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Pages/_ViewImports.cshtml
+++ b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/ReactRedux-CSharp/Pages/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using Company.WebApplication1
+@using Company.WebApplication1
 @namespace Company.WebApplication1.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/ProjectTemplates/test/ByteOrderMarkTest.cs b/src/ProjectTemplates/test/ByteOrderMarkTest.cs
index 7b5137bdc6..6e6ed2a352 100644
--- a/src/ProjectTemplates/test/ByteOrderMarkTest.cs
+++ b/src/ProjectTemplates/test/ByteOrderMarkTest.cs
@@ -21,83 +21,86 @@ namespace Templates.Test
             _output = output;
         }
 
-        [ConditionalTheory]
-        [QuarantinedTest]
+        [Theory]
         [InlineData("Web.ProjectTemplates")]
         [InlineData("Web.Spa.ProjectTemplates")]
+        [InlineData("Web.ItemTemplates")]
+        [InlineData("Web.Client.ItemTemplates")]
         public void JSAndJSONInAllTemplates_ShouldNotContainBOM(string projectName)
         {
-            var currentDirectory = Directory.GetCurrentDirectory();
-            var projectTemplateDir = Directory.GetParent(currentDirectory).Parent.Parent.Parent.FullName;
-            var path = Path.Combine(projectName, "content");
-            var directories = Directory.GetDirectories(Path.Combine(projectTemplateDir, path), "*Sharp");
+            var templateDirectoryPath = GetTemplateDirectoryPath(projectName);
 
             var filesWithBOMCharactersPresent = false;
-            foreach (var directory in directories)
+            var files = (IEnumerable<string>)Directory.GetFiles(templateDirectoryPath, "*.json");
+            files = files.Concat(Directory.GetFiles(templateDirectoryPath, "*.js"));
+
+            foreach (var file in files)
             {
-                var files = (IEnumerable<string>)Directory.GetFiles(directory, "*.json");
-                files = files.Concat(Directory.GetFiles(directory, "*.js"));
-                foreach (var file in files)
+                var filePath = Path.GetFullPath(file);
+                using var fileStream = new FileStream(filePath, FileMode.Open);
+
+                var bytes = new byte[3];
+                fileStream.Read(bytes, 0, 3);
+
+                // Check for UTF8 BOM 0xEF,0xBB,0xBF
+                if (bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF)
                 {
-                    var filePath = Path.GetFullPath(file);
-                    using var fileStream = new FileStream(filePath, FileMode.Open);
-
-                    var bytes = new byte[3];
-                    fileStream.Read(bytes, 0, 3);
-
-                    // Check for UTF8 BOM 0xEF,0xBB,0xBF
-                    if (bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF)
-                    {
-                        _output.WriteLine($"File {filePath} has UTF-8 BOM characters.");
-                        filesWithBOMCharactersPresent = true;
-                    }
-                    // Check for UTF16 BOM 0xFF, 0xFE
-                    if (bytes[0] == 0xFF && bytes[1] == 0xFE)
-                    {
-                        _output.WriteLine($"File {filePath} has UTF-16 BOM characters.");
-                        filesWithBOMCharactersPresent = true;
-                    }
+                    _output.WriteLine($"File {filePath} has UTF-8 BOM characters.");
+                    filesWithBOMCharactersPresent = true;
+                }
+                // Check for UTF16 BOM 0xFF, 0xFE
+                if (bytes[0] == 0xFF && bytes[1] == 0xFE)
+                {
+                    _output.WriteLine($"File {filePath} has UTF-16 BOM characters.");
+                    filesWithBOMCharactersPresent = true;
                 }
             }
 
             Assert.False(filesWithBOMCharactersPresent);
         }
 
-        [ConditionalFact]
-        [QuarantinedTest]
-        public void RazorFilesInWebProjects_ShouldContainBOM()
+        [Theory]
+        [InlineData("Web.ProjectTemplates")]
+        [InlineData("Web.Spa.ProjectTemplates")]
+        [InlineData("Web.ItemTemplates")]
+        [InlineData("Web.Client.ItemTemplates")]
+        public void RazorFilesInWebProjects_ShouldContainBOM(string projectName)
         {
-            var projectName = "Web.ProjectTemplates";
-            var currentDirectory = Directory.GetCurrentDirectory();
-            var projectTemplateDir = Directory.GetParent(currentDirectory).Parent.Parent.Parent.FullName;
-            var path = Path.Combine(projectName, "content");
-            var directories = Directory.GetDirectories(Path.Combine(projectTemplateDir, path), "*Sharp");
+            var templateDirectoryPath = GetTemplateDirectoryPath(projectName);
 
-            bool nonBOMFilesPresent = false;
+            var nonBOMFilesPresent = false;
 
-            foreach (var directory in directories)
+            var files = (IEnumerable<string>)Directory.GetFiles(templateDirectoryPath, "*.cshtml", SearchOption.AllDirectories);
+            files = files.Concat(Directory.GetFiles(templateDirectoryPath, "*.razor", SearchOption.AllDirectories));
+
+            foreach (var file in files)
             {
-                var files = (IEnumerable<string>)Directory.GetFiles(directory, "*.cshtml", SearchOption.AllDirectories);
-                files = files.Concat(Directory.GetFiles(directory, "*.razor", SearchOption.AllDirectories));
-                foreach (var file in files)
+                var filePath = Path.GetFullPath(file);
+                using var fileStream = new FileStream(filePath, FileMode.Open);
+
+                var bytes = new byte[3];
+                fileStream.Read(bytes, 0, 3);
+
+                // Check for UTF8 BOM 0xEF,0xBB,0xBF
+                var expectedBytes = Encoding.UTF8.GetPreamble();
+                if (bytes[0] != expectedBytes[0] || bytes[1] != expectedBytes[1] || bytes[2] != expectedBytes[2])
                 {
-                    var filePath = Path.GetFullPath(file);
-                    using var fileStream = new FileStream(filePath, FileMode.Open);
-
-                    var bytes = new byte[3];
-                    fileStream.Read(bytes, 0, 3);
-
-                    // Check for UTF8 BOM 0xEF,0xBB,0xBF
-                    var expectedBytes = Encoding.UTF8.GetPreamble();
-                    if (bytes[0] != expectedBytes[0] || bytes[1] != expectedBytes[1] || bytes[2] != expectedBytes[2])
-                    {
-                        _output.WriteLine($"File {filePath} does not have UTF-8 BOM characters.");
-                        nonBOMFilesPresent = true;
-                    }
+                    _output.WriteLine($"File {filePath} does not have UTF-8 BOM characters.");
+                    nonBOMFilesPresent = true;
                 }
             }
 
             Assert.False(nonBOMFilesPresent);
         }
+
+        private string GetTemplateDirectoryPath(string projectName)
+        {
+            var currentDirectory = Directory.GetCurrentDirectory();
+            var AssetsDir = Path.Combine(currentDirectory, "Assets");
+            var path = Path.Combine(projectName, "content");
+            var templateDirectoryPath = Path.Combine(AssetsDir, path);
+
+            return templateDirectoryPath;
+        }
     }
 }
diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
index 69e08a8c83..7e143f533a 100644
--- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
+++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <!-- Shared testing infrastructure for running E2E tests using selenium -->
   <Import Project="$(SharedSourceRoot)E2ETesting\E2ETesting.props" />
@@ -31,6 +31,14 @@
     <Compile Include="..\Shared\**" LinkBase="Helpers" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!-- We need the actual templates in the output directory for tests to verify file encodings. -->
+    <Content Include="..\Web.ProjectTemplates\**" LinkBase="Assets\Web.ProjectTemplates" />
+    <Content Include="..\Web.Spa.ProjectTemplates\**" LinkBase="Assets\Web.Spa.ProjectTemplates" />
+    <Content Include="..\Web.ItemTemplates\**" LinkBase="Assets\Web.ItemTemplates" />
+    <Content Include="..\Web.Client.ItemTemplates\**" LinkBase="Assets\Web.Client.ItemTemplates" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
index c488b1e443..e3b0fa320a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
@@ -1,4 +1,4 @@
-@model DateTime
+@model DateTime
 
 @addTagHelper "InputTestTagHelper, AppCode"
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
index c488b1e443..e3b0fa320a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
@@ -1,4 +1,4 @@
-@model DateTime
+@model DateTime
 
 @addTagHelper "InputTestTagHelper, AppCode"
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
index f1f8cd28b9..c3df65cf63 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.codegen.cs
@@ -34,7 +34,6 @@ namespace __GeneratedComponent
 #line hidden
 #nullable disable
             );
-            __builder.AddMarkupContent(4, "\r\n");
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
index 46b8dd5f06..a1f78b09a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_Runtime.ir.txt
@@ -16,7 +16,5 @@ Document -
                         LazyIntermediateToken - (74:3,0 [4] BasicComponent.cshtml) - Html -     
                     CSharpExpression - (79:3,5 [29] BasicComponent.cshtml)
                         LazyIntermediateToken - (79:3,5 [29] BasicComponent.cshtml) - CSharp - string.Format("{0}", "Hello")
-                    HtmlContent - (108:3,34 [2] BasicComponent.cshtml)
-                        LazyIntermediateToken - (108:3,34 [2] BasicComponent.cshtml) - Html - \n
             CSharpCode - (132:6,12 [37] BasicComponent.cshtml)
                 LazyIntermediateToken - (132:6,12 [37] BasicComponent.cshtml) - CSharp - \n    void IDisposable.Dispose(){ }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
index c488b1e443..e3b0fa320a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper.cshtml
@@ -1,4 +1,4 @@
-@model DateTime
+@model DateTime
 
 @addTagHelper "InputTestTagHelper, AppCode"
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
index b457a1f9f7..cbadc7ee10 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/ComponentResources.resx
@@ -201,6 +201,15 @@
   <data name="PageDirective_RouteToken_Name" xml:space="preserve">
     <value>route template</value>
   </data>
+  <data name="PreserveWhitespaceDirective_BooleanToken_Description" xml:space="preserve">
+    <value>True if whitespace should be preserved, otherwise false.</value>
+  </data>
+  <data name="PreserveWhitespaceDirective_BooleanToken_Name" xml:space="preserve">
+    <value>Preserve</value>
+  </data>
+  <data name="PreserveWhitespaceDirective_Description" xml:space="preserve">
+    <value>Specifies whether or not whitespace should be preserved exactly. Defaults to false for better performance.</value>
+  </data>
   <data name="RefTagHelper_Documentation" xml:space="preserve">
     <value>Populates the specified field or property with a reference to the element or component.</value>
   </data>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPreserveWhitespaceDirective.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPreserveWhitespaceDirective.cs
new file mode 100644
index 0000000000..72f657aac7
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentPreserveWhitespaceDirective.cs
@@ -0,0 +1,30 @@
+// 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;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    internal static class ComponentPreserveWhitespaceDirective
+    {
+        public static readonly DirectiveDescriptor Directive = DirectiveDescriptor.CreateDirective(
+            "preservewhitespace",
+            DirectiveKind.SingleLine,
+            builder =>
+            {
+                builder.AddBooleanToken(ComponentResources.PreserveWhitespaceDirective_BooleanToken_Name, ComponentResources.PreserveWhitespaceDirective_BooleanToken_Description);
+                builder.Usage = DirectiveUsage.FileScopedMultipleOccurring;
+                builder.Description = ComponentResources.PreserveWhitespaceDirective_Description;
+            });
+
+        public static void Register(RazorProjectEngineBuilder builder)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.AddDirective(Directive, FileKinds.Component, FileKinds.ComponentImport);
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
index 08eec3ae80..761e3eb8f4 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentWhitespacePass.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Linq;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 
 namespace Microsoft.AspNetCore.Razor.Language.Components
@@ -38,17 +39,45 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 return;
             }
 
+            // Respect @preservewhitespace directives
+            if (PreserveWhitespaceIsEnabled(documentNode))
+            {
+                return;
+            }
+
             var method = documentNode.FindPrimaryMethod();
             if (method != null)
             {
                 RemoveContiguousWhitespace(method.Children, TraversalDirection.Forwards);
                 RemoveContiguousWhitespace(method.Children, TraversalDirection.Backwards);
+
+                var visitor = new Visitor();
+                visitor.Visit(method);
             }
         }
 
-        private static void RemoveContiguousWhitespace(IntermediateNodeCollection nodes, TraversalDirection direction)
+        private static bool PreserveWhitespaceIsEnabled(DocumentIntermediateNode documentNode)
         {
-            var position = direction == TraversalDirection.Forwards ? 0 : nodes.Count - 1;
+            // If there's no @preservewhitespace attribute, the default is that we *don't* preserve whitespace
+            var shouldPreserveWhitespace = false;
+
+            foreach (var preserveWhitespaceDirective in documentNode.FindDirectiveReferences(ComponentPreserveWhitespaceDirective.Directive))
+            {
+                var token = ((DirectiveIntermediateNode)preserveWhitespaceDirective.Node).Tokens.FirstOrDefault();
+                var shouldPreserveWhitespaceContent = token?.Content;
+                if (shouldPreserveWhitespaceContent != null)
+                {
+                    shouldPreserveWhitespace = string.Equals(shouldPreserveWhitespaceContent, "true", StringComparison.Ordinal);
+                }
+            }
+
+            return shouldPreserveWhitespace;
+        }
+
+        private static int RemoveContiguousWhitespace(IntermediateNodeCollection nodes, TraversalDirection direction, int? startIndex = null)
+        {
+            var position = startIndex.GetValueOrDefault(direction == TraversalDirection.Forwards ? 0 : nodes.Count - 1);
+            var countRemoved = 0;
             while (position >= 0 && position < nodes.Count)
             {
                 var node = nodes[position];
@@ -76,7 +105,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                         shouldContinueIteration = false;
                         break;
 
-                    case CSharpCodeIntermediateNode codeIntermediateNode:
+                    case CSharpCodeIntermediateNode _:
                         shouldRemoveNode = false;
                         shouldContinueIteration = false;
                         break;
@@ -90,6 +119,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                 if (shouldRemoveNode)
                 {
                     nodes.RemoveAt(position);
+                    countRemoved++;
                     if (direction == TraversalDirection.Forwards)
                     {
                         position--;
@@ -103,6 +133,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
                     break;
                 }
             }
+
+            return countRemoved;
         }
 
         enum TraversalDirection
@@ -110,5 +142,39 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
             Forwards,
             Backwards
         }
+
+        class Visitor : IntermediateNodeWalker
+        {
+            public override void VisitMarkupElement(MarkupElementIntermediateNode node)
+            {
+                RemoveContiguousWhitespace(node.Children, TraversalDirection.Forwards);
+                RemoveContiguousWhitespace(node.Children, TraversalDirection.Backwards);
+                VisitDefault(node);
+            }
+
+            public override void VisitTagHelperBody(TagHelperBodyIntermediateNode node)
+            {
+                // The goal here is to remove leading/trailing whitespace inside component child content. However,
+                // at the time this whitespace pass runs, ComponentChildContent is still TagHelperBody in the tree.
+                RemoveContiguousWhitespace(node.Children, TraversalDirection.Forwards);
+                RemoveContiguousWhitespace(node.Children, TraversalDirection.Backwards);
+                VisitDefault(node);
+            }
+
+            public override void VisitDefault(IntermediateNode node)
+            {
+                // For any CSharpCodeIntermediateNode children, remove their preceding and trailing whitespace
+                for (var childIndex = 0; childIndex < node.Children.Count; childIndex++)
+                {
+                    if (node.Children[childIndex] is CSharpCodeIntermediateNode)
+                    {
+                        childIndex -= RemoveContiguousWhitespace(node.Children, TraversalDirection.Backwards, childIndex - 1);
+                        RemoveContiguousWhitespace(node.Children, TraversalDirection.Forwards, childIndex + 1);
+                    }
+                }
+
+                base.VisitDefault(node);
+            }
+        }
     }
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorBuilderExtensions.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorBuilderExtensions.cs
index e8257bba7f..3e9c14b46f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorBuilderExtensions.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveDescriptorBuilderExtensions.cs
@@ -117,6 +117,28 @@ namespace Microsoft.AspNetCore.Razor.Language
             return builder;
         }
 
+        public static IDirectiveDescriptorBuilder AddBooleanToken(this IDirectiveDescriptorBuilder builder)
+        {
+            return AddBooleanToken(builder, name: null, description: null);
+        }
+
+        public static IDirectiveDescriptorBuilder AddBooleanToken(this IDirectiveDescriptorBuilder builder, string name, string description)
+        {
+            if (builder == null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            builder.Tokens.Add(
+                DirectiveTokenDescriptor.CreateToken(
+                    DirectiveTokenKind.Boolean,
+                    optional: false,
+                    name: name,
+                    description: description));
+
+            return builder;
+        }
+
         public static IDirectiveDescriptorBuilder AddOptionalMemberToken(this IDirectiveDescriptorBuilder builder)
         {
             return AddOptionalMemberToken(builder, name: null, description: null);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenKind.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenKind.cs
index 916a57c3ca..88b214071c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenKind.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/DirectiveTokenKind.cs
@@ -10,5 +10,6 @@ namespace Microsoft.AspNetCore.Razor.Language
         Member,
         String,
         Attribute,
+        Boolean,
     }
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
index 9daadf3714..fd94358c15 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/CSharpCodeParser.cs
@@ -1322,7 +1322,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                             if (tokenDescriptor.Kind == DirectiveTokenKind.Member ||
                                 tokenDescriptor.Kind == DirectiveTokenKind.Namespace ||
                                 tokenDescriptor.Kind == DirectiveTokenKind.Type ||
-                                tokenDescriptor.Kind == DirectiveTokenKind.Attribute)
+                                tokenDescriptor.Kind == DirectiveTokenKind.Attribute ||
+                                tokenDescriptor.Kind == DirectiveTokenKind.Boolean)
                             {
                                 SpanContext.ChunkGenerator = SpanChunkGenerator.Null;
                                 SpanContext.EditHandler.AcceptedCharacters = AcceptedCharactersInternal.Whitespace;
@@ -1417,6 +1418,22 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                                     return;
                                 }
                                 break;
+
+                            case DirectiveTokenKind.Boolean:
+                                if (AtBooleanLiteral() && !CurrentToken.ContainsDiagnostics)
+                                {
+                                    AcceptAndMoveNext();
+                                }
+                                else
+                                {
+                                    Context.ErrorSink.OnError(
+                                        RazorDiagnosticFactory.CreateParsing_DirectiveExpectsBooleanLiteral(
+                                            new SourceSpan(CurrentStart, CurrentToken.Content.Length), descriptor.Directive));
+                                    builder.Add(BuildDirective());
+                                    return;
+                                }
+                                break;
+
                             case DirectiveTokenKind.Attribute:
                                 if (At(SyntaxKind.LeftBracket))
                                 {
@@ -1699,6 +1716,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             return false;
         }
 
+        private bool AtBooleanLiteral()
+        {
+            var result = CSharpTokenizer.GetTokenKeyword(CurrentToken);
+            return result.HasValue && (result.Value == CSharpKeyword.True || result.Value == CSharpKeyword.False);
+        }
+
         private void SetupExpressionParsers()
         {
             MapExpressionKeyword(ParseAwaitExpression, CSharpKeyword.Await);
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
index 1617fc417c..3d1fbb234a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorDiagnosticFactory.cs
@@ -426,6 +426,16 @@ namespace Microsoft.AspNetCore.Razor.Language
         {
             return RazorDiagnostic.Create(Parsing_DirectiveExpectsCSharpAttribute, location, directiveName);
         }
+
+        internal static readonly RazorDiagnosticDescriptor Parsing_DirectiveExpectsBooleanLiteral =
+            new RazorDiagnosticDescriptor(
+                $"{DiagnosticPrefix}1038",
+                () => Resources.DirectiveExpectsBooleanLiteral,
+                RazorDiagnosticSeverity.Error);
+        public static RazorDiagnostic CreateParsing_DirectiveExpectsBooleanLiteral(SourceSpan location, string directiveName)
+        {
+            return RazorDiagnostic.Create(Parsing_DirectiveExpectsBooleanLiteral, location, directiveName);
+        }
         #endregion
 
         #region Semantic Errors
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
index 07729dcd25..ac75eac6d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorProjectEngine.cs
@@ -120,7 +120,7 @@ namespace Microsoft.AspNetCore.Razor.Language
                 NamespaceDirective.Register(builder);
                 AttributeDirective.Register(builder);
 
-                AddComponentFeatures(builder);
+                AddComponentFeatures(builder, configuration.LanguageVersion);
             }
 
             LoadExtensions(builder, configuration.Extensions);
@@ -206,7 +206,7 @@ namespace Microsoft.AspNetCore.Razor.Language
             });
         }
 
-        private static void AddComponentFeatures(RazorProjectEngineBuilder builder)
+        private static void AddComponentFeatures(RazorProjectEngineBuilder builder, RazorLanguageVersion razorLanguageVersion)
         {
             // Project Engine Features
             builder.Features.Add(new ComponentImportProjectFeature());
@@ -218,6 +218,11 @@ namespace Microsoft.AspNetCore.Razor.Language
             ComponentPageDirective.Register(builder);
             ComponentTypeParamDirective.Register(builder);
 
+            if (razorLanguageVersion.CompareTo(RazorLanguageVersion.Version_5_0) >= 0)
+            {
+                ComponentPreserveWhitespaceDirective.Register(builder);
+            }
+
             // Document Classifier
             builder.Features.Add(new ComponentDocumentClassifierPass());
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
index 33c63d93c2..65fdf317bb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Resources.resx
@@ -559,4 +559,7 @@
   <data name="TagHelper_InvalidRequiredDirectiveAttributeName" xml:space="preserve">
     <value>Invalid tag helper required directive attribute '{0}'. The directive attribute '{1}' should start with a '@' character.</value>
   </data>
+  <data name="DirectiveExpectsBooleanLiteral" xml:space="preserve">
+    <value>The '{0}' directive expects a boolean literal.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
index 365b7909f9..6c00e4f322 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentMarkupBlockPassTest.cs
@@ -47,11 +47,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 </html>");
 
             var expected = NormalizeContent(@"
-<html>
-  <head cool=""beans"">
+<html><head cool=""beans"">
     Hello, World!
-  </head>
-</html>");
+  </head></html>");
 
             var documentNode = Lower(document);
 
@@ -163,7 +161,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
   </head>
 </html>");
 
-            var expected = NormalizeContent("<div>foo</div>\n  ");
+            var expected = NormalizeContent("<div>foo</div>");
 
             var documentNode = Lower(document);
 
@@ -349,11 +347,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Components
 </html>");
 
             var expected = NormalizeContent(@"
-<head cool=""beans"">
-    <option value=""1"">One</option>
-    <option selected value=""2"">Two</option>
-  </head>
-");
+<head cool=""beans""><option value=""1"">One</option>
+    <option selected value=""2"">Two</option></head>");
 
             var documentNode = Lower(document);
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentWhitespacePassTest.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentWhitespacePassTest.cs
new file mode 100644
index 0000000000..d2356ace8b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/Components/ComponentWhitespacePassTest.cs
@@ -0,0 +1,183 @@
+// 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;
+using System.Linq;
+using System.Text;
+using Microsoft.AspNetCore.Razor.Language.Intermediate;
+using Xunit;
+
+namespace Microsoft.AspNetCore.Razor.Language.Components
+{
+    public class ComponentWhitespacePassTest
+    {
+        public ComponentWhitespacePassTest()
+        {
+            Pass = new ComponentWhitespacePass();
+            ProjectEngine = (DefaultRazorProjectEngine)RazorProjectEngine.Create(
+                RazorConfiguration.Default,
+                RazorProjectFileSystem.Create(Environment.CurrentDirectory),
+                b =>
+                {
+                    if (b.Features.OfType<ComponentWhitespacePass>().Any())
+                    {
+                        b.Features.Remove(b.Features.OfType<ComponentWhitespacePass>().Single());
+                    }
+                });
+            Engine = ProjectEngine.Engine;
+
+            Pass.Engine = Engine;
+        }
+
+        private DefaultRazorProjectEngine ProjectEngine { get; }
+
+        private RazorEngine Engine { get; }
+
+        private ComponentWhitespacePass Pass { get; }
+
+        [Fact]
+        public void Execute_RemovesLeadingAndTrailingWhitespace()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+
+<span>@(""Hello, world"")</span>
+
+");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var method = documentNode.FindPrimaryMethod();
+            var child = Assert.IsType<MarkupElementIntermediateNode>(Assert.Single(method.Children));
+            Assert.Equal("span", child.TagName);
+        }
+
+        [Fact]
+        public void Execute_RemovesLeadingAndTrailingWhitespaceInsideElement()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<parent>
+    <child>   Hello, @("" w o r l d "")   </child>
+</parent>
+");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var parentElement = Assert.IsType<MarkupElementIntermediateNode>(Assert.Single(documentNode.FindPrimaryMethod().Children));
+            var childElement = Assert.IsType<MarkupElementIntermediateNode>(Assert.Single(parentElement.Children));
+            Assert.Equal("child", childElement.TagName);
+            Assert.Collection(childElement.Children,
+                node =>
+                {
+                    var htmlNode = Assert.IsType<HtmlContentIntermediateNode>(node);
+                    Assert.Equal("   Hello, ", GetContent(htmlNode));
+                },
+                node =>
+                {
+                    var csharpExpressionNode = Assert.IsType<CSharpExpressionIntermediateNode>(node);
+                    Assert.Equal(@""" w o r l d """, GetContent(csharpExpressionNode));
+                });
+        }
+
+        [Fact]
+        public void Execute_LeavesWhitespaceBetweenSiblingElements()
+        {
+            // Arrange
+            var document = CreateDocument(@" <elem attr=@expr /> <elem attr=@expr /> ");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            Assert.Collection(documentNode.FindPrimaryMethod().Children,
+                node => Assert.IsType<MarkupElementIntermediateNode>(node),
+                node => Assert.IsType<HtmlContentIntermediateNode>(node),
+                node => Assert.IsType<MarkupElementIntermediateNode>(node));
+        }
+
+        [Fact]
+        public void Execute_RemovesWhitespacePrecedingAndTrailingCSharpCode()
+        {
+            // Arrange
+            var document = CreateDocument(@"
+<parent>
+    <child>@val1a @val1b</child>
+
+@if(someExpression) { /* Do something */ }
+
+    <child>@val2a @val2b</child>
+</parent>
+");
+
+            var documentNode = Lower(document);
+
+            // Act
+            Pass.Execute(document, documentNode);
+
+            // Assert
+            var parentElement = Assert.IsType<MarkupElementIntermediateNode>(Assert.Single(documentNode.FindPrimaryMethod().Children));
+            Assert.Collection(parentElement.Children,
+                node =>
+                {
+                    Assert.Equal("child", Assert.IsType<MarkupElementIntermediateNode>(node).TagName);
+                    Assert.Collection(node.Children,
+                        x => Assert.IsType<CSharpExpressionIntermediateNode>(x),
+                        x => Assert.IsType<HtmlContentIntermediateNode>(x), // We don't remove whitespace before/after C# expressions
+                        x => Assert.IsType<CSharpExpressionIntermediateNode>(x));
+                },
+                node => Assert.IsType<CSharpCodeIntermediateNode>(node),
+                node =>
+                {
+                    Assert.Equal("child", Assert.IsType<MarkupElementIntermediateNode>(node).TagName);
+                    Assert.Collection(node.Children,
+                        x => Assert.IsType<CSharpExpressionIntermediateNode>(x),
+                        x => Assert.IsType<HtmlContentIntermediateNode>(x), // We don't remove whitespace before/after C# expressions
+                        x => Assert.IsType<CSharpExpressionIntermediateNode>(x));
+                });
+        }
+
+        private RazorCodeDocument CreateDocument(string content)
+        {
+            var source = RazorSourceDocument.Create(content, "test.cshtml");
+            return ProjectEngine.CreateCodeDocumentCore(source, FileKinds.Component);
+        }
+
+        private DocumentIntermediateNode Lower(RazorCodeDocument codeDocument)
+        {
+            for (var i = 0; i < Engine.Phases.Count; i++)
+            {
+                var phase = Engine.Phases[i];
+                if (phase is IRazorCSharpLoweringPhase)
+                {
+                    break;
+                }
+
+                phase.Execute(codeDocument);
+            }
+
+            return codeDocument.GetDocumentIntermediateNode();
+        }
+
+        private static string GetContent(IntermediateNode node)
+        {
+            var builder = new StringBuilder();
+            var tokens = node.Children.OfType<IntermediateToken>();
+            foreach (var token in tokens)
+            {
+                builder.Append(token.Content);
+            }
+            return builder.ToString();
+        }
+    }
+}
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
index b9fb0e4020..2c01ed31f2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/IntegrationTests/ComponentCodeGenerationTestBase.cs
@@ -2081,6 +2081,69 @@ namespace AnotherTest
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void Component_WithPreserveWhitespaceDirective_True()
+        {
+            // Arrange / Act
+            var generated = CompileToCSharp(@"
+@preservewhitespace true
+
+<ul>
+    @foreach (var item in Enumerable.Range(1, 100))
+    {
+        <li>
+            @item
+        </li>
+    }
+</ul>
+
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_WithPreserveWhitespaceDirective_False()
+        {
+            // Arrange / Act
+            var generated = CompileToCSharp(@"
+@preservewhitespace false
+
+<ul>
+    @foreach (var item in Enumerable.Range(1, 100))
+    {
+        <li>
+            @item
+        </li>
+    }
+</ul>
+
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_WithPreserveWhitespaceDirective_Invalid()
+        {
+            // Arrange / Act
+            var generated = CompileToCSharp(@"
+@preservewhitespace someVariable
+@code {
+    bool someVariable = false;
+}
+", throwOnFailure: false);
+
+            // Assert
+            Assert.Collection(generated.Diagnostics, d => { Assert.Equal("RZ1038", d.Id); });
+        }
+
         #endregion
 
         #region EventCallback
@@ -4506,13 +4569,17 @@ namespace Test
 {
     public class SomeOtherComponent : ComponentBase
     {
+        [Parameter] public RenderFragment ChildContent { get; set; }
     }
 }
 "));
 
             // Act
             var generated = CompileToCSharp(@"
-<SomeOtherComponent />
+<SomeOtherComponent>
+    <h1>Child content at @DateTime.Now</h1>
+    <p>Very @(""good"")</p>
+</SomeOtherComponent>
 
 <h1>Hello</h1>");
 
@@ -4618,6 +4685,32 @@ namespace Test
             CompileToAssembly(generated);
         }
 
+        [Fact]
+        public void WhiteSpace_WithPreserveWhitespace()
+        {
+            // Arrange
+
+            // Act
+            var generated = CompileToCSharp(@"
+
+@preservewhitespace true
+
+    <elem attr=@Foo>
+        <child />
+    </elem>
+
+    @code {
+        int Foo = 18;
+    }
+
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
 
         #region Imports
@@ -4753,6 +4846,58 @@ namespace New.Test
             AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
             CompileToAssembly(generated);
         }
+
+        [Fact]
+        public void Component_PreserveWhitespaceDirective_InImports()
+        {
+            // Arrange
+            var importContent = @"
+@preservewhitespace true
+";
+            var importItem = CreateProjectItem("_Imports.razor", importContent, FileKinds.ComponentImport);
+            ImportItems.Add(importItem);
+
+            // Act
+            var generated = CompileToCSharp(@"
+
+<parent>
+    <child> @DateTime.Now </child>
+</parent>
+
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
+        [Fact]
+        public void Component_PreserveWhitespaceDirective_OverrideImports()
+        {
+            // Arrange
+            var importContent = @"
+@preservewhitespace true
+";
+            var importItem = CreateProjectItem("_Imports.razor", importContent, FileKinds.ComponentImport);
+            ImportItems.Add(importItem);
+
+            // Act
+            var generated = CompileToCSharp(@"
+@preservewhitespace false
+
+<parent>
+    <child> @DateTime.Now </child>
+</parent>
+
+");
+
+            // Assert
+            AssertDocumentNodeMatchesBaseline(generated.CodeDocument);
+            AssertCSharpDocumentMatchesBaseline(generated.CodeDocument);
+            CompileToAssembly(generated);
+        }
+
         #endregion
 
         #region Misc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml
index e2c134767e..9e49ff03a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7.cshtml
@@ -1,4 +1,4 @@
-<body>
+<body>
     @{
         var nameLookup = new Dictionary<string, (string FirstName, string LastName, object Extra)>()
         {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml
index cc52b3487f..4d5797f18e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements.cshtml
@@ -1,4 +1,4 @@
-@implements IDisposable
+@implements IDisposable
 
 @functions {
     void IDisposable.Dispose() { }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.codegen.cs
new file mode 100644
index 0000000000..736d66bd85
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.codegen.cs
@@ -0,0 +1,34 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       __o = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.ir.txt
new file mode 100644
index 0000000000..7d133754d9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.ir.txt
@@ -0,0 +1,31 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+                DirectiveToken - (20:0,20 [4] x:\dir\subdir\Test\_Imports.razor) - true
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - parent
+                    HtmlContent - (8:0,8 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (8:0,8 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                    MarkupElement - (14:1,4 [30] x:\dir\subdir\Test\TestComponent.cshtml) - child
+                        HtmlContent - (21:1,11 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (21:1,11 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  
+                        CSharpExpression - (23:1,13 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (23:1,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - DateTime.Now
+                        HtmlContent - (35:1,25 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (35:1,25 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  
+                    HtmlContent - (44:1,34 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (44:1,34 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (55:2,9 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (55:2,9 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.mappings.txt
new file mode 100644
index 0000000000..a197792aa0
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (23:1,13 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+|DateTime.Now|
+Generated Location: (865:24,13 [12] )
+|DateTime.Now|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d75d0e63e4
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.codegen.cs
@@ -0,0 +1,37 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+       __o = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.ir.txt
new file mode 100644
index 0000000000..94eecda6a9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+                DirectiveToken - (20:0,20 [4] x:\dir\subdir\Test\_Imports.razor) - true
+                DirectiveToken - (20:0,20 [5] x:\dir\subdir\Test\TestComponent.cshtml) - false
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (27:1,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (27:1,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (29:2,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - parent
+                    HtmlContent - (37:2,8 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (37:2,8 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                    MarkupElement - (43:3,4 [30] x:\dir\subdir\Test\TestComponent.cshtml) - child
+                        HtmlContent - (50:3,11 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (50:3,11 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  
+                        CSharpExpression - (52:3,13 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (52:3,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - DateTime.Now
+                        HtmlContent - (64:3,25 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (64:3,25 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  
+                    HtmlContent - (73:3,34 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (73:3,34 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (84:4,9 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (84:4,9 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.mappings.txt
new file mode 100644
index 0000000000..234aca0387
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.mappings.txt
@@ -0,0 +1,5 @@
+Source Location: (52:3,13 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+|DateTime.Now|
+Generated Location: (925:27,13 [12] )
+|DateTime.Now|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.codegen.cs
new file mode 100644
index 0000000000..7b36a7dcc8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.codegen.cs
@@ -0,0 +1,54 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+     foreach (var item in Enumerable.Range(1, 100))
+    {
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
+       __o = item;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 8 "x:\dir\subdir\Test\TestComponent.cshtml"
+             
+    }
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.ir.txt
new file mode 100644
index 0000000000..b2b9b58e7e
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+                DirectiveToken - (20:0,20 [5] x:\dir\subdir\Test\TestComponent.cshtml) - false
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (27:1,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (27:1,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (29:2,0 [126] x:\dir\subdir\Test\TestComponent.cshtml) - ul
+                    HtmlContent - (33:2,4 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (33:2,4 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                    CSharpCode - (40:3,5 [63] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (40:3,5 [63] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - foreach (var item in Enumerable.Range(1, 100))\n    {\n        
+                    MarkupElement - (103:5,8 [38] x:\dir\subdir\Test\TestComponent.cshtml) - li
+                        HtmlContent - (107:5,12 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (107:5,12 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n            
+                        CSharpExpression - (122:6,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (122:6,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item
+                        HtmlContent - (126:6,17 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (126:6,17 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n        
+                    CSharpCode - (141:7,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (141:7,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }
+                    HtmlContent - (148:8,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (148:8,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (155:9,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (155:9,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.mappings.txt
new file mode 100644
index 0000000000..13d244d11c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.mappings.txt
@@ -0,0 +1,21 @@
+Source Location: (40:3,5 [63] x:\dir\subdir\Test\TestComponent.cshtml)
+|foreach (var item in Enumerable.Range(1, 100))
+    {
+        |
+Generated Location: (917:27,5 [63] )
+|foreach (var item in Enumerable.Range(1, 100))
+    {
+        |
+
+Source Location: (122:6,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|item|
+Generated Location: (1115:36,13 [4] )
+|item|
+
+Source Location: (141:7,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    }|
+Generated Location: (1255:43,13 [7] )
+|
+    }|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_Invalid/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_Invalid/TestComponent.codegen.cs
new file mode 100644
index 0000000000..e5901d1f3a
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_Invalid/TestComponent.codegen.cs
@@ -0,0 +1,42 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+#nullable restore
+#line 1 "x:\dir\subdir\Test\TestComponent.cshtml"
+__o = preservewhitespace;
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+       
+    bool someVariable = false;
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_Invalid/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_Invalid/TestComponent.ir.txt
new file mode 100644
index 0000000000..4c2856ab92
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_Invalid/TestComponent.ir.txt
@@ -0,0 +1,24 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                CSharpExpression - (1:0,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (1:0,1 [18] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - preservewhitespace
+                HtmlContent - (19:0,19 [15] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (19:0,19 [15] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  someVariable\n
+                HtmlContent - (76:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (76:3,1 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+            CSharpCode - (41:1,7 [34] x:\dir\subdir\Test\TestComponent.cshtml)
+                LazyIntermediateToken - (41:1,7 [34] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    bool someVariable = false;\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_Invalid/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_Invalid/TestComponent.mappings.txt
new file mode 100644
index 0000000000..feab0bd6e8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_Invalid/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (1:0,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
+|preservewhitespace|
+Generated Location: (858:24,6 [18] )
+|preservewhitespace|
+
+Source Location: (41:1,7 [34] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    bool someVariable = false;
+|
+Generated Location: (1055:33,7 [34] )
+|
+    bool someVariable = false;
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.codegen.cs
new file mode 100644
index 0000000000..7b36a7dcc8
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.codegen.cs
@@ -0,0 +1,54 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+     foreach (var item in Enumerable.Range(1, 100))
+    {
+        
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
+       __o = item;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 8 "x:\dir\subdir\Test\TestComponent.cshtml"
+             
+    }
+
+#line default
+#line hidden
+#nullable disable
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.ir.txt
new file mode 100644
index 0000000000..250cb24438
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.ir.txt
@@ -0,0 +1,37 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+                DirectiveToken - (20:0,20 [4] x:\dir\subdir\Test\TestComponent.cshtml) - true
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (26:1,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (26:1,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (28:2,0 [126] x:\dir\subdir\Test\TestComponent.cshtml) - ul
+                    HtmlContent - (32:2,4 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (32:2,4 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                    CSharpCode - (39:3,5 [63] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (39:3,5 [63] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - foreach (var item in Enumerable.Range(1, 100))\n    {\n        
+                    MarkupElement - (102:5,8 [38] x:\dir\subdir\Test\TestComponent.cshtml) - li
+                        HtmlContent - (106:5,12 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (106:5,12 [14] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n            
+                        CSharpExpression - (121:6,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (121:6,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item
+                        HtmlContent - (125:6,17 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (125:6,17 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n        
+                    CSharpCode - (140:7,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (140:7,13 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    }
+                    HtmlContent - (147:8,5 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (147:8,5 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (154:9,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (154:9,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.mappings.txt
new file mode 100644
index 0000000000..a78b63be25
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.mappings.txt
@@ -0,0 +1,21 @@
+Source Location: (39:3,5 [63] x:\dir\subdir\Test\TestComponent.cshtml)
+|foreach (var item in Enumerable.Range(1, 100))
+    {
+        |
+Generated Location: (917:27,5 [63] )
+|foreach (var item in Enumerable.Range(1, 100))
+    {
+        |
+
+Source Location: (121:6,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+|item|
+Generated Location: (1115:36,13 [4] )
+|item|
+
+Source Location: (140:7,13 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+    }|
+Generated Location: (1255:43,13 [7] )
+|
+    }|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 930aa172c7..f71ec2143d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -21,6 +21,20 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.AddAttribute(-1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                    __o = DateTime.Now;
+
+#line default
+#line hidden
+#nullable disable
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+        __o = "good";
+
+#line default
+#line hidden
+#nullable disable
             }
             ));
 #nullable restore
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
index 003b347321..e49244d1ba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
@@ -14,9 +14,26 @@ Document -
             CSharpCode - 
                 IntermediateToken -  - CSharp - #pragma warning restore 0414
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent
-                HtmlContent - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    LazyIntermediateToken - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
-                MarkupElement - (26:2,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1
-                    HtmlContent - (30:2,4 [5] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (30:2,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
+                Component - (0:0,0 [115] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent
+                    ComponentChildContent -  - ChildContent - context
+                        HtmlContent - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                        MarkupElement - (26:1,4 [39] x:\dir\subdir\Test\TestComponent.cshtml) - h1
+                            HtmlContent - (30:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                                LazyIntermediateToken - (30:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Child content at 
+                            CSharpExpression - (48:1,26 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+                                LazyIntermediateToken - (48:1,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - DateTime.Now
+                        HtmlContent - (65:1,43 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (65:1,43 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                        MarkupElement - (71:2,4 [21] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                            HtmlContent - (74:2,7 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                                LazyIntermediateToken - (74:2,7 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Very 
+                            CSharpExpression - (81:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                                LazyIntermediateToken - (81:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "good"
+                        HtmlContent - (92:2,25 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (92:2,25 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (115:3,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (115:3,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                MarkupElement - (119:5,0 [14] x:\dir\subdir\Test\TestComponent.cshtml) - h1
+                    HtmlContent - (123:5,4 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (123:5,4 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Hello
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt
new file mode 100644
index 0000000000..11d74d7703
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.mappings.txt
@@ -0,0 +1,10 @@
+Source Location: (48:1,26 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+|DateTime.Now|
+Generated Location: (1001:25,26 [12] )
+|DateTime.Now|
+
+Source Location: (81:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+|"good"|
+Generated Location: (1150:32,14 [6] )
+|"good"|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.codegen.cs
new file mode 100644
index 0000000000..977f3d0e56
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 219
+        private void __RazorDirectiveTokenHelpers__() {
+        ((System.Action)(() => {
+        }
+        ))();
+        }
+        #pragma warning restore 219
+        #pragma warning disable 0414
+        private static System.Object __o = null;
+        #pragma warning restore 0414
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __o = 
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                Foo
+
+#line default
+#line hidden
+#nullable disable
+            ;
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
+           
+        int Foo = 18;
+    
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.ir.txt
new file mode 100644
index 0000000000..a90647f02f
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [12] ) - System
+        UsingDirective - (18:2,1 [32] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [17] ) - System.Linq
+        UsingDirective - (73:4,1 [28] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [37] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            DesignTimeDirective - 
+                DirectiveToken - (20:0,20 [4] x:\dir\subdir\Test\TestComponent.cshtml) - true
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning disable 0414
+            CSharpCode - 
+                IntermediateToken -  - CSharp - private static System.Object __o = null;
+            CSharpCode - 
+                IntermediateToken -  - CSharp - #pragma warning restore 0414
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (26:1,0 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (26:1,0 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                MarkupElement - (32:2,4 [48] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (37:2,9 [10] x:\dir\subdir\Test\TestComponent.cshtml) -  attr= - 
+                        CSharpExpressionAttributeValue - (43:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            LazyIntermediateToken - (44:2,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Foo
+                    HtmlContent - (48:2,20 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (48:2,20 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n        
+                    MarkupElement - (58:3,8 [9] x:\dir\subdir\Test\TestComponent.cshtml) - child
+                    HtmlContent - (67:3,17 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (67:3,17 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                HtmlContent - (80:4,11 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (80:4,11 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n    
+                HtmlContent - (125:8,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (125:8,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+            CSharpCode - (95:6,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+                LazyIntermediateToken - (95:6,11 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        int Foo = 18;\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.mappings.txt
new file mode 100644
index 0000000000..6f2c28937b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentDesignTimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.mappings.txt
@@ -0,0 +1,14 @@
+Source Location: (44:2,16 [3] x:\dir\subdir\Test\TestComponent.cshtml)
+|Foo|
+Generated Location: (948:28,16 [3] )
+|Foo|
+
+Source Location: (95:6,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+        int Foo = 18;
+    |
+Generated Location: (1148:38,11 [29] )
+|
+        int Foo = 18;
+    |
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.codegen.cs
index 5803014b53..3b9d2751e1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.codegen.cs
@@ -14,9 +14,8 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "div");
-            __builder.AddMarkupContent(1, "\r\n  ");
-            __builder.OpenElement(2, "input");
-            __builder.AddAttribute(3, "@bind", 
+            __builder.OpenElement(1, "input");
+            __builder.AddAttribute(2, "@bind", 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
                  ParentValue
@@ -26,7 +25,6 @@ namespace Test
 #nullable disable
             );
             __builder.CloseElement();
-            __builder.AddMarkupContent(4, "\r\n");
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.ir.txt
index cdc244dd9b..1f9d6cbb52 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.ir.txt
@@ -8,13 +8,9 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [45] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
                     MarkupElement - (9:1,2 [28] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute - (15:1,8 [21] x:\dir\subdir\Test\TestComponent.cshtml) -  @bind=" - "
                             CSharpExpressionAttributeValue - (23:1,16 [12] x:\dir\subdir\Test\TestComponent.cshtml) - 
                                 LazyIntermediateToken - (24:1,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ParentValue
-                    HtmlContent - (37:1,30 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (37:1,30 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (54:3,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
                 LazyIntermediateToken - (54:3,7 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    public string ParentValue { get; set; } = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.mappings.txt
index c25138f2f9..3bd3f99ff9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/BindToElement_WithoutCloseTag/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (54:3,7 [55] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     public string ParentValue { get; set; } = "hi";
 |
-Generated Location: (1133:34,7 [55] )
+Generated Location: (1027:32,7 [55] )
 |
     public string ParentValue { get; set; } = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
index dbec07d0cb..2e63ffb34a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.codegen.cs
@@ -24,9 +24,8 @@ namespace Test
 #nullable disable
             ));
             __builder.AddAttribute(2, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment<string>)((context) => (__builder2) => {
-                __builder2.AddMarkupContent(3, "\r\n  ");
-                __builder2.OpenElement(4, "div");
-                __builder2.AddContent(5, 
+                __builder2.OpenElement(3, "div");
+                __builder2.AddContent(4, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
         context.ToLower()
@@ -36,7 +35,6 @@ namespace Test
 #nullable disable
                 );
                 __builder2.CloseElement();
-                __builder2.AddMarkupContent(6, "\r\n");
             }
             ));
             __builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
index adc85111c5..74d6105b61 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent/TestComponent.ir.txt
@@ -9,13 +9,9 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [90] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
-                        HtmlContent - (41:0,41 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                            LazyIntermediateToken - (41:0,41 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
                         MarkupElement - (45:1,2 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div
                             CSharpExpression - (51:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
                                 LazyIntermediateToken - (51:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
-                        HtmlContent - (74:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                            LazyIntermediateToken - (74:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                     ComponentTypeArgument - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - TItem
                         LazyIntermediateToken - (19:0,19 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - string
                     ComponentAttribute - (32:0,32 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
index 22d9a102cb..46d5636adb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.codegen.cs
@@ -22,9 +22,8 @@ namespace Test
 #line hidden
 #nullable disable
             , 2, (context) => (__builder2) => {
-                __builder2.AddMarkupContent(3, "\r\n  ");
-                __builder2.OpenElement(4, "div");
-                __builder2.AddContent(5, 
+                __builder2.OpenElement(3, "div");
+                __builder2.AddContent(4, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
         context.ToLower()
@@ -34,7 +33,6 @@ namespace Test
 #nullable disable
                 );
                 __builder2.CloseElement();
-                __builder2.AddMarkupContent(6, "\r\n");
             }
             );
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
index a899c300ed..02d8c7e2f3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_GenericChildContent_TypeInference/TestComponent.ir.txt
@@ -9,13 +9,9 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [77] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
-                        HtmlContent - (28:0,28 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                            LazyIntermediateToken - (28:0,28 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
                         MarkupElement - (32:1,2 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div
                             CSharpExpression - (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
                                 LazyIntermediateToken - (38:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
-                        HtmlContent - (61:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                            LazyIntermediateToken - (61:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                     ComponentAttribute - (19:0,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (20:0,20 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             LazyIntermediateToken - (21:0,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
index 481ebef830..1a167bc537 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.codegen.cs
@@ -29,10 +29,8 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-            __builder.AddContent(0, "        ");
-            __builder.OpenComponent<Test.MyComponent>(1);
+            __builder.OpenComponent<Test.MyComponent>(0);
             __builder.CloseComponent();
-            __builder.AddMarkupContent(2, "\r\n");
 #nullable restore
 #line 6 "x:\dir\subdir\Test\TestComponent.cshtml"
     }
@@ -40,7 +38,6 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-            __builder.AddMarkupContent(3, "\r\n");
 #nullable restore
 #line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
    RenderChildComponent(); 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
index 930a2aeca7..69e9566787 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.ir.txt
@@ -10,14 +10,8 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml)
                     LazyIntermediateToken - (54:1,2 [42] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void RenderChildComponent()\n    {\n
-                HtmlContent - (96:4,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
-                    LazyIntermediateToken - (96:4,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
                 Component - (104:4,8 [15] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
-                HtmlContent - (119:4,23 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    LazyIntermediateToken - (119:4,23 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 CSharpCode - (121:5,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
                     LazyIntermediateToken - (121:5,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
-                HtmlContent - (131:7,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    LazyIntermediateToken - (131:7,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 CSharpCode - (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
                     LazyIntermediateToken - (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -  RenderChildComponent(); 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
index 69488d8b9b..105b799512 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_InLocalFunction/TestComponent.mappings.txt
@@ -12,12 +12,12 @@ Generated Location: (757:24,2 [42] )
 Source Location: (121:5,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
 |    }
 |
-Generated Location: (1121:37,0 [7] )
+Generated Location: (1019:35,0 [7] )
 |    }
 |
 
 Source Location: (135:8,2 [25] x:\dir\subdir\Test\TestComponent.cshtml)
 | RenderChildComponent(); |
-Generated Location: (1302:45,2 [25] )
+Generated Location: (1148:42,2 [25] )
 | RenderChildComponent(); |
 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
index b0d7535388..a0d8581d8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.codegen.cs
@@ -38,8 +38,7 @@ namespace Test
             }
             ));
             __builder.AddAttribute(5, "AnotherChildContent", (Microsoft.AspNetCore.Components.RenderFragment<Test.MyComponent<string, int>.Context>)((item) => (__builder2) => {
-                __builder2.AddMarkupContent(6, "\r\n  ");
-                __builder2.AddContent(7, 
+                __builder2.AddContent(6, 
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
    System.Math.Max(0, item.Item)
@@ -48,7 +47,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                __builder2.AddMarkupContent(8, ";\r\n");
+                __builder2.AddMarkupContent(7, ";\r\n");
             }
             ));
             __builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
index d3ac4d2440..89a67e7387 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics/TestComponent.ir.txt
@@ -13,9 +13,6 @@ Document -
                             CSharpExpression - (77:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
                                 LazyIntermediateToken - (77:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
                     ComponentChildContent - (117:2,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherChildContent - item
-                        HtmlContent - (153:2,36 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                            LazyIntermediateToken - (153:2,36 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                            LazyIntermediateToken - (155:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html -   
                         CSharpExpression - (158:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
                             LazyIntermediateToken - (158:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - System.Math.Max(0, item.Item)
                         HtmlContent - (187:3,32 [3] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
index 09f1b42acd..0e4bdda7a2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.codegen.cs
@@ -43,8 +43,7 @@ namespace Test
                 __builder2.CloseElement();
             }
             , 6, (item) => (__builder2) => {
-                __builder2.AddMarkupContent(7, "\r\n  ");
-                __builder2.AddContent(8, 
+                __builder2.AddContent(7, 
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
    System.Math.Max(0, item.Item)
@@ -53,7 +52,7 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                __builder2.AddMarkupContent(9, ";\r\n");
+                __builder2.AddMarkupContent(8, ";\r\n");
             }
             );
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
index 81ed5115f8..0041a579f2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_MultipleGenerics_TypeInference/TestComponent.ir.txt
@@ -13,9 +13,6 @@ Document -
                             CSharpExpression - (78:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml)
                                 LazyIntermediateToken - (78:1,22 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
                     ComponentChildContent - (118:2,0 [95] x:\dir\subdir\Test\TestComponent.cshtml) - AnotherChildContent - item
-                        HtmlContent - (154:2,36 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                            LazyIntermediateToken - (154:2,36 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                            LazyIntermediateToken - (156:3,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html -   
                         CSharpExpression - (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml)
                             LazyIntermediateToken - (159:3,3 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - System.Math.Max(0, item.Item)
                         HtmlContent - (188:3,32 [3] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
index 7495074ab8..572862ad71 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.codegen.cs
@@ -29,7 +29,6 @@ namespace Test
 #nullable disable
                 );
                 __builder2.CloseElement();
-                __builder2.AddMarkupContent(7, "\r\n  ");
             }
             ));
             __builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
index ceaf16b99e..56dc82560d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterName/TestComponent.ir.txt
@@ -17,8 +17,6 @@ Document -
                                     LazyIntermediateToken - (89:2,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
                             CSharpExpression - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
                                 LazyIntermediateToken - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.ToLowerInvariant()
-                        HtmlContent - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                            LazyIntermediateToken - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
                     ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - AttributeStructure.DoubleQuotes
                         HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             LazyIntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
index 7495074ab8..572862ad71 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.codegen.cs
@@ -29,7 +29,6 @@ namespace Test
 #nullable disable
                 );
                 __builder2.CloseElement();
-                __builder2.AddMarkupContent(7, "\r\n  ");
             }
             ));
             __builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
index b79b0cb9e0..1dcf38a762 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ChildComponent_WithGenericChildContent_SetsParameterNameOnComponent/TestComponent.ir.txt
@@ -17,8 +17,6 @@ Document -
                                     LazyIntermediateToken - (89:2,28 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html - 1
                             CSharpExpression - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml)
                                 LazyIntermediateToken - (93:2,32 [23] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item.ToLowerInvariant()
-                        HtmlContent - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                            LazyIntermediateToken - (129:2,68 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
                     ComponentAttribute - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - MyAttr - MyAttr - AttributeStructure.DoubleQuotes
                         HtmlContent - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                             LazyIntermediateToken - (21:0,21 [3] x:\dir\subdir\Test\TestComponent.cshtml) - Html - abc
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
index e278e10afa..01fd4ddfba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.codegen.cs
@@ -19,7 +19,7 @@ using Microsoft.AspNetCore.Components;
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.AddMarkupContent(0, "<h1>Item1</h1>\r\n");
+            __builder.AddMarkupContent(0, "<h1>Item1</h1>");
 #nullable restore
 #line 6 "x:\dir\subdir\Test\TestComponent.cshtml"
  foreach (var item2 in Items2)
@@ -28,10 +28,8 @@ using Microsoft.AspNetCore.Components;
 #line default
 #line hidden
 #nullable disable
-            __builder.AddContent(1, "    ");
-            __builder.OpenElement(2, "p");
-            __builder.AddMarkupContent(3, "\r\n    ");
-            __builder.AddContent(4, 
+            __builder.OpenElement(1, "p");
+            __builder.AddContent(2, 
 #nullable restore
 #line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
      ChildContent(item2)
@@ -40,9 +38,8 @@ using Microsoft.AspNetCore.Components;
 #line hidden
 #nullable disable
             );
-            __builder.AddMarkupContent(5, ";\r\n    ");
+            __builder.AddMarkupContent(3, ";\r\n    ");
             __builder.CloseElement();
-            __builder.AddMarkupContent(6, "\r\n");
 #nullable restore
 #line 11 "x:\dir\subdir\Test\TestComponent.cshtml"
 }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
index dc03e9a9d6..ebd0a97fae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.ir.txt
@@ -7,21 +7,14 @@ Document -
         UsingDirective - (1:0,1 [40] x:\dir\subdir\Test\TestComponent.cshtml) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase -  - TItem1, TItem2
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                MarkupBlock -  - <h1>Item1</h1>\n
+                MarkupBlock -  - <h1>Item1</h1>
                 CSharpCode - (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml)
                     LazyIntermediateToken - (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - foreach (var item2 in Items2)\n{\n
-                HtmlContent - (132:7,0 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    LazyIntermediateToken - (132:7,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html -     
                 MarkupElement - (136:7,4 [40] x:\dir\subdir\Test\TestComponent.cshtml) - p
-                    HtmlContent - (139:7,7 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (139:7,7 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
-                        LazyIntermediateToken - (141:8,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html -     
                     CSharpExpression - (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml)
                         LazyIntermediateToken - (146:8,5 [19] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ChildContent(item2)
                     HtmlContent - (165:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml)
                         LazyIntermediateToken - (165:8,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Html - ;\n    
-                HtmlContent - (176:9,8 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    LazyIntermediateToken - (176:9,8 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 CSharpCode - (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml)
                     LazyIntermediateToken - (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - }\n
             CSharpCode - (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
index 830e2d6d1b..f039f8827d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ComponentWithTypeParameters/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (98:5,1 [34] x:\dir\subdir\Test\TestComponent.cshtml)
 |foreach (var item2 in Items2)
 {
 |
-Generated Location: (783:26,1 [34] )
+Generated Location: (779:24,1 [34] )
 |foreach (var item2 in Items2)
 {
 |
@@ -10,7 +10,7 @@ Generated Location: (783:26,1 [34] )
 Source Location: (178:10,0 [3] x:\dir\subdir\Test\TestComponent.cshtml)
 |}
 |
-Generated Location: (1432:51,0 [3] )
+Generated Location: (1274:46,0 [3] )
 |}
 |
 
@@ -20,7 +20,7 @@ Source Location: (188:11,7 [185] x:\dir\subdir\Test\TestComponent.cshtml)
     [Parameter] public List<TItem2> Items2 { get; set; }
     [Parameter] public RenderFragment<TItem2> ChildContent { get; set; }
 |
-Generated Location: (1612:60,7 [185] )
+Generated Location: (1454:55,7 [185] )
 |
     [Parameter] public TItem1 Item1 { get; set; }
     [Parameter] public List<TItem2> Items2 { get; set; }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.codegen.cs
new file mode 100644
index 0000000000..55984e6f79
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.codegen.cs
@@ -0,0 +1,38 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __builder.OpenElement(0, "parent");
+            __builder.AddMarkupContent(1, "\r\n    ");
+            __builder.OpenElement(2, "child");
+            __builder.AddContent(3, " ");
+            __builder.AddContent(4, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+             DateTime.Now
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __builder.AddContent(5, " ");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(6, "\r\n");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(7, "\r\n\r\n");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.ir.txt
new file mode 100644
index 0000000000..b0c99573e9
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_PreserveWhitespaceDirective_InImports/TestComponent.ir.txt
@@ -0,0 +1,23 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (0:0,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - parent
+                    HtmlContent - (8:0,8 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (8:0,8 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                    MarkupElement - (14:1,4 [30] x:\dir\subdir\Test\TestComponent.cshtml) - child
+                        HtmlContent - (21:1,11 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (21:1,11 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  
+                        CSharpExpression - (23:1,13 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (23:1,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - DateTime.Now
+                        HtmlContent - (35:1,25 [1] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (35:1,25 [1] x:\dir\subdir\Test\TestComponent.cshtml) - Html -  
+                    HtmlContent - (44:1,34 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (44:1,34 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                HtmlContent - (55:2,9 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (55:2,9 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.codegen.cs
new file mode 100644
index 0000000000..d126cfe163
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.codegen.cs
@@ -0,0 +1,33 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __builder.OpenElement(0, "parent");
+            __builder.OpenElement(1, "child");
+            __builder.AddContent(2, 
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+             DateTime.Now
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __builder.CloseElement();
+            __builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.ir.txt
new file mode 100644
index 0000000000..2609421ad6
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_PreserveWhitespaceDirective_OverrideImports/TestComponent.ir.txt
@@ -0,0 +1,13 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (29:2,0 [55] x:\dir\subdir\Test\TestComponent.cshtml) - parent
+                    MarkupElement - (43:3,4 [30] x:\dir\subdir\Test\TestComponent.cshtml) - child
+                        CSharpExpression - (52:3,13 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (52:3,13 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - DateTime.Now
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
index 8deff24077..ce02f4d669 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.codegen.cs
@@ -15,7 +15,6 @@ namespace Test
         {
             __builder.OpenComponent<Test.Counter>(0);
             __builder.CloseComponent();
-            __builder.AddMarkupContent(1, "\r\n");
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
  if (true)
@@ -25,7 +24,7 @@ namespace Test
 #line default
 #line hidden
 #nullable disable
-            __builder.AddContent(2, "This text is rendered");
+            __builder.AddContent(1, "This text is rendered");
 #nullable restore
 #line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
                                       
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
index b1f16b8022..15063495d1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.ir.txt
@@ -8,8 +8,6 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [11] x:\dir\subdir\Test\TestComponent.cshtml) - Counter
-                HtmlContent - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    LazyIntermediateToken - (11:0,11 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 CSharpCode - (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
                     LazyIntermediateToken - (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - if (true)\n{\n    
                 HtmlContent - (38:3,10 [21] x:\dir\subdir\Test\TestComponent.cshtml)
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
index 82206d510e..5a0f537e81 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_TextTagsAreNotRendered/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (14:1,1 [18] x:\dir\subdir\Test\TestComponent.cshtml)
 |if (true)
 {
     |
-Generated Location: (733:20,1 [18] )
+Generated Location: (681:19,1 [18] )
 |if (true)
 {
     |
@@ -11,7 +11,7 @@ Source Location: (66:3,38 [5] x:\dir\subdir\Test\TestComponent.cshtml)
 |
 }
 |
-Generated Location: (974:30,38 [5] )
+Generated Location: (922:29,38 [5] )
 |
 }
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
index ba7c557a07..4313d7cb1e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.codegen.cs
@@ -13,8 +13,7 @@ namespace Test
         #pragma warning disable 1998
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
-            __builder.AddMarkupContent(0, "<!DOCTYPE html>\r\n");
-            __builder.AddMarkupContent(1, "<div>\r\n</div>");
+            __builder.AddMarkupContent(0, "<!DOCTYPE html>\r\n<div></div>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
index 7187dffef0..059d6b2fb3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithDocType/TestComponent.ir.txt
@@ -7,6 +7,4 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                HtmlContent - (0:0,0 [17] x:\dir\subdir\Test\TestComponent.cshtml)
-                    LazyIntermediateToken - (0:0,0 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Html - <!DOCTYPE html>\n
-                MarkupBlock -  - <div>\n</div>
+                MarkupBlock -  - <!DOCTYPE html>\n<div></div>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.codegen.cs
new file mode 100644
index 0000000000..9a181f7d60
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.codegen.cs
@@ -0,0 +1,48 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __builder.OpenElement(0, "ul");
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+     foreach (var item in Enumerable.Range(1, 100))
+    {
+
+#line default
+#line hidden
+#nullable disable
+            __builder.OpenElement(1, "li");
+            __builder.AddContent(2, 
+#nullable restore
+#line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
+             item
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __builder.CloseElement();
+#nullable restore
+#line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
+    }
+
+#line default
+#line hidden
+#nullable disable
+            __builder.CloseElement();
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.ir.txt
new file mode 100644
index 0000000000..606239d583
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                MarkupElement - (29:2,0 [126] x:\dir\subdir\Test\TestComponent.cshtml) - ul
+                    CSharpCode - (35:3,0 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (35:3,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     
+                    CSharpCode - (40:3,5 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (40:3,5 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - foreach (var item in Enumerable.Range(1, 100))\n    {\n
+                    MarkupElement - (103:5,8 [38] x:\dir\subdir\Test\TestComponent.cshtml) - li
+                        CSharpExpression - (122:6,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (122:6,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item
+                    CSharpCode - (143:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (143:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.mappings.txt
new file mode 100644
index 0000000000..e9f9b3f79c
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_False/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (40:3,5 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|foreach (var item in Enumerable.Range(1, 100))
+    {
+|
+Generated Location: (634:18,5 [55] )
+|foreach (var item in Enumerable.Range(1, 100))
+    {
+|
+
+Source Location: (143:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|    }
+|
+Generated Location: (1086:37,0 [7] )
+|    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.codegen.cs
new file mode 100644
index 0000000000..6bbdab0428
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.codegen.cs
@@ -0,0 +1,55 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __builder.AddMarkupContent(0, "\r\n");
+            __builder.OpenElement(1, "ul");
+            __builder.AddMarkupContent(2, "\r\n");
+#nullable restore
+#line 4 "x:\dir\subdir\Test\TestComponent.cshtml"
+     foreach (var item in Enumerable.Range(1, 100))
+    {
+
+#line default
+#line hidden
+#nullable disable
+            __builder.AddContent(3, "        ");
+            __builder.OpenElement(4, "li");
+            __builder.AddMarkupContent(5, "\r\n            ");
+            __builder.AddContent(6, 
+#nullable restore
+#line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
+             item
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __builder.AddMarkupContent(7, "\r\n        ");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(8, "\r\n");
+#nullable restore
+#line 9 "x:\dir\subdir\Test\TestComponent.cshtml"
+    }
+
+#line default
+#line hidden
+#nullable disable
+            __builder.CloseElement();
+            __builder.AddMarkupContent(9, "\r\n\r\n");
+        }
+        #pragma warning restore 1998
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.ir.txt
new file mode 100644
index 0000000000..ed9ae587ab
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.ir.txt
@@ -0,0 +1,34 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (26:1,0 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (26:1,0 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                MarkupElement - (28:2,0 [126] x:\dir\subdir\Test\TestComponent.cshtml) - ul
+                    HtmlContent - (32:2,4 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (32:2,4 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                    CSharpCode - (34:3,0 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (34:3,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     
+                    CSharpCode - (39:3,5 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (39:3,5 [55] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - foreach (var item in Enumerable.Range(1, 100))\n    {\n
+                    HtmlContent - (94:5,0 [8] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (94:5,0 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html -         
+                    MarkupElement - (102:5,8 [38] x:\dir\subdir\Test\TestComponent.cshtml) - li
+                        HtmlContent - (106:5,12 [14] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (106:5,12 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                            LazyIntermediateToken - (108:6,0 [12] x:\dir\subdir\Test\TestComponent.cshtml) - Html -             
+                        CSharpExpression - (121:6,13 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (121:6,13 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - item
+                        HtmlContent - (125:6,17 [10] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (125:6,17 [10] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n        
+                    HtmlContent - (140:7,13 [2] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (140:7,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
+                    CSharpCode - (142:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+                        LazyIntermediateToken - (142:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp -     }\n
+                HtmlContent - (154:9,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (154:9,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.mappings.txt
new file mode 100644
index 0000000000..d3e86e7e52
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/Component_WithPreserveWhitespaceDirective_True/TestComponent.mappings.txt
@@ -0,0 +1,16 @@
+Source Location: (39:3,5 [55] x:\dir\subdir\Test\TestComponent.cshtml)
+|foreach (var item in Enumerable.Range(1, 100))
+    {
+|
+Generated Location: (738:20,5 [55] )
+|foreach (var item in Enumerable.Range(1, 100))
+    {
+|
+
+Source Location: (142:8,0 [7] x:\dir\subdir\Test\TestComponent.cshtml)
+|    }
+|
+Generated Location: (1416:43,0 [7] )
+|    }
+|
+
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
index 8698a027f3..54b8bf2363 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.codegen.cs
@@ -21,11 +21,10 @@ using Microsoft.AspNetCore.Components.Web;
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "div");
-            __builder.AddMarkupContent(1, "\r\n  ");
-            __builder.OpenElement(2, "input");
-            __builder.AddAttribute(3, "type", "text");
-            __builder.AddAttribute(4, "Value", "17");
-            __builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(1, "input");
+            __builder.AddAttribute(2, "type", "text");
+            __builder.AddAttribute(3, "Value", "17");
+            __builder.AddAttribute(4, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         text
@@ -34,10 +33,9 @@ using Microsoft.AspNetCore.Components.Web;
 #line hidden
 #nullable disable
             ));
-            __builder.AddAttribute(6, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
+            __builder.AddAttribute(5, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
             __builder.SetUpdatesAttributeName("value");
             __builder.CloseElement();
-            __builder.AddMarkupContent(7, "\r\n");
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
index 15f4e81c6e..1fbd4bc525 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.ir.txt
@@ -9,8 +9,6 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
                     MarkupElement - (53:2,2 [52] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
                             HtmlAttributeValue - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
@@ -28,7 +26,5 @@ Document -
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
                                 IntermediateToken -  - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                    HtmlContent - (105:2,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (105:2,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
                 LazyIntermediateToken - (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
index f76be5b17e..6b6beae840 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_DifferentCasing_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1704:45,12 [35] )
+Generated Location: (1598:43,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
index 1692b5a96d..af3808fed1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.codegen.cs
@@ -14,15 +14,13 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "div");
-            __builder.AddMarkupContent(1, "\r\n  ");
-            __builder.OpenElement(2, "a");
-            __builder.AddAttribute(3, "href", "/cool-url");
-            __builder.AddAttribute(4, "style", true);
-            __builder.AddAttribute(5, "disabled", true);
-            __builder.AddAttribute(6, "href", "/even-cooler-url");
-            __builder.AddContent(7, "Learn the ten cool tricks your compiler author will hate!");
+            __builder.OpenElement(1, "a");
+            __builder.AddAttribute(2, "href", "/cool-url");
+            __builder.AddAttribute(3, "style", true);
+            __builder.AddAttribute(4, "disabled", true);
+            __builder.AddAttribute(5, "href", "/even-cooler-url");
+            __builder.AddContent(6, "Learn the ten cool tricks your compiler author will hate!");
             __builder.CloseElement();
-            __builder.AddMarkupContent(8, "\r\n");
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
index 855ace3024..2a9f025133 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError/TestComponent.ir.txt
@@ -8,8 +8,6 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [140] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
                     MarkupElement - (9:1,2 [123] x:\dir\subdir\Test\TestComponent.cshtml) - a
                         HtmlAttribute - (11:1,4 [17] x:\dir\subdir\Test\TestComponent.cshtml) -  href=" - "
                             HtmlAttributeValue - (18:1,11 [9] x:\dir\subdir\Test\TestComponent.cshtml) - 
@@ -21,5 +19,3 @@ Document -
                                 LazyIntermediateToken - (53:1,46 [16] x:\dir\subdir\Test\TestComponent.cshtml) - Html - /even-cooler-url
                         HtmlContent - (71:1,64 [57] x:\dir\subdir\Test\TestComponent.cshtml)
                             LazyIntermediateToken - (71:1,64 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
-                    HtmlContent - (132:1,125 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (132:1,125 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
index 0d94284032..0258d9ebf9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.codegen.cs
@@ -21,10 +21,9 @@ using Microsoft.AspNetCore.Components.Web;
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "div");
-            __builder.AddMarkupContent(1, "\r\n  ");
-            __builder.OpenElement(2, "input");
-            __builder.AddAttribute(3, "type", "text");
-            __builder.AddAttribute(4, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.ChangeEventArgs>(this, 
+            __builder.OpenElement(1, "input");
+            __builder.AddAttribute(2, "type", "text");
+            __builder.AddAttribute(3, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.ChangeEventArgs>(this, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                                                                () => {}
@@ -33,7 +32,7 @@ using Microsoft.AspNetCore.Components.Web;
 #line hidden
 #nullable disable
             ));
-            __builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.AddAttribute(4, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                    text
@@ -42,10 +41,9 @@ using Microsoft.AspNetCore.Components.Web;
 #line hidden
 #nullable disable
             ));
-            __builder.AddAttribute(6, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
+            __builder.AddAttribute(5, "oninput", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
             __builder.SetUpdatesAttributeName("value");
             __builder.CloseElement();
-            __builder.AddMarkupContent(7, "\r\n");
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
index cbc170c605..8a69783148 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.ir.txt
@@ -9,8 +9,6 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [112] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
                     MarkupElement - (53:2,2 [95] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
                             HtmlAttributeValue - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
@@ -30,7 +28,5 @@ Document -
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
                                 IntermediateToken -  - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                    HtmlContent - (148:2,97 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (148:2,97 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (170:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
                 LazyIntermediateToken - (170:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
index 867fd2df72..b15a594cd2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindOnInput/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (170:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (2036:53,12 [35] )
+Generated Location: (1930:51,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
index 5c4151e716..45b501f2e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.codegen.cs
@@ -21,11 +21,10 @@ using Microsoft.AspNetCore.Components.Web;
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "div");
-            __builder.AddMarkupContent(1, "\r\n  ");
-            __builder.OpenElement(2, "input");
-            __builder.AddAttribute(3, "type", "text");
-            __builder.AddAttribute(4, "value", "17");
-            __builder.AddAttribute(5, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
+            __builder.OpenElement(1, "input");
+            __builder.AddAttribute(2, "type", "text");
+            __builder.AddAttribute(3, "value", "17");
+            __builder.AddAttribute(4, "value", Microsoft.AspNetCore.Components.BindConverter.FormatValue(
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                         text
@@ -34,10 +33,9 @@ using Microsoft.AspNetCore.Components.Web;
 #line hidden
 #nullable disable
             ));
-            __builder.AddAttribute(6, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
+            __builder.AddAttribute(5, "onchange", Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, text));
             __builder.SetUpdatesAttributeName("value");
             __builder.CloseElement();
-            __builder.AddMarkupContent(7, "\r\n");
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
index 6ae1973ad2..a4577a9dba 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.ir.txt
@@ -9,8 +9,6 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [69] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
                     MarkupElement - (53:2,2 [52] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute -  - type=" - "
                             HtmlAttributeValue - (66:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
@@ -28,7 +26,5 @@ Document -
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.CreateBinder(this, __value => text = __value, 
                                 IntermediateToken -  - CSharp - text
                                 IntermediateToken -  - CSharp - )
-                    HtmlContent - (105:2,54 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (105:2,54 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
                 LazyIntermediateToken - (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    private string text = "hi";\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
index f76be5b17e..6b6beae840 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_BindValue/TestComponent.mappings.txt
@@ -2,7 +2,7 @@ Source Location: (127:4,12 [35] x:\dir\subdir\Test\TestComponent.cshtml)
 |
     private string text = "hi";
 |
-Generated Location: (1704:45,12 [35] )
+Generated Location: (1598:43,12 [35] )
 |
     private string text = "hi";
 |
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
index f9ca0bdec8..5140f2959a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.codegen.cs
@@ -21,10 +21,9 @@ using Microsoft.AspNetCore.Components.Web;
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "div");
-            __builder.AddMarkupContent(1, "\r\n  ");
-            __builder.OpenElement(2, "a");
-            __builder.AddAttribute(3, "onclick", "test()");
-            __builder.AddAttribute(4, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+            __builder.OpenElement(1, "a");
+            __builder.AddAttribute(2, "onclick", "test()");
+            __builder.AddAttribute(3, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                                 () => {}
@@ -33,9 +32,8 @@ using Microsoft.AspNetCore.Components.Web;
 #line hidden
 #nullable disable
             ));
-            __builder.AddContent(5, "Learn the ten cool tricks your compiler author will hate!");
+            __builder.AddContent(4, "Learn the ten cool tricks your compiler author will hate!");
             __builder.CloseElement();
-            __builder.AddMarkupContent(6, "\r\n");
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
index af5b32da26..0a6e32e41f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_IsAnError_EventHandler/TestComponent.ir.txt
@@ -9,8 +9,6 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [118] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
                     MarkupElement - (53:2,2 [101] x:\dir\subdir\Test\TestComponent.cshtml) - a
                         HtmlContent - (93:2,42 [57] x:\dir\subdir\Test\TestComponent.cshtml)
                             LazyIntermediateToken - (93:2,42 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
@@ -22,5 +20,3 @@ Document -
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
                                 LazyIntermediateToken - (83:2,32 [8] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - () => {}
                                 IntermediateToken -  - CSharp - )
-                    HtmlContent - (154:2,103 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (154:2,103 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
index 1d52b314c0..4ee5c736c6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.codegen.cs
@@ -14,16 +14,14 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "div");
-            __builder.AddMarkupContent(1, "\r\n  ");
-            __builder.OpenElement(2, "a");
-            __builder.AddAttribute(3, "href", "/cool-url");
-            __builder.AddAttribute(4, "style", true);
-            __builder.AddAttribute(5, "disabled", true);
-            __builder.AddAttribute(6, "href", "/even-cooler-url");
-            __builder.AddAttribute(7, "href", true);
-            __builder.AddContent(8, "Learn the ten cool tricks your compiler author will hate!");
+            __builder.OpenElement(1, "a");
+            __builder.AddAttribute(2, "href", "/cool-url");
+            __builder.AddAttribute(3, "style", true);
+            __builder.AddAttribute(4, "disabled", true);
+            __builder.AddAttribute(5, "href", "/even-cooler-url");
+            __builder.AddAttribute(6, "href", true);
+            __builder.AddContent(7, "Learn the ten cool tricks your compiler author will hate!");
             __builder.CloseElement();
-            __builder.AddMarkupContent(9, "\r\n");
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
index eab06c4348..00541c63d5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/DuplicateMarkupAttributes_Multiple_IsAnError/TestComponent.ir.txt
@@ -8,8 +8,6 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [145] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (5:0,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
                     MarkupElement - (9:1,2 [128] x:\dir\subdir\Test\TestComponent.cshtml) - a
                         HtmlAttribute - (11:1,4 [17] x:\dir\subdir\Test\TestComponent.cshtml) -  href=" - "
                             HtmlAttributeValue - (18:1,11 [9] x:\dir\subdir\Test\TestComponent.cshtml) - 
@@ -22,5 +20,3 @@ Document -
                         HtmlAttribute - (70:1,63 [5] x:\dir\subdir\Test\TestComponent.cshtml) -  href - 
                         HtmlContent - (76:1,69 [57] x:\dir\subdir\Test\TestComponent.cshtml)
                             LazyIntermediateToken - (76:1,69 [57] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Learn the ten cool tricks your compiler author will hate!
-                    HtmlContent - (137:1,130 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (137:1,130 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs
index a0a824d92b..177ceabaf7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.codegen.cs
@@ -21,9 +21,8 @@ using Microsoft.AspNetCore.Components.Web;
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "div");
-            __builder.AddMarkupContent(1, "\r\n  ");
-            __builder.OpenElement(2, "input");
-            __builder.AddAttribute(3, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
+            __builder.OpenElement(1, "input");
+            __builder.AddAttribute(2, "onclick", Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
 #nullable restore
 #line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
                    OnClick
@@ -33,7 +32,6 @@ using Microsoft.AspNetCore.Components.Web;
 #nullable disable
             ));
             __builder.CloseElement();
-            __builder.AddMarkupContent(4, "\r\n");
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.ir.txt
index 74a027d012..8349e3075f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.ir.txt
@@ -9,15 +9,11 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (44:1,0 [43] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (49:1,5 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
                     MarkupElement - (53:2,2 [26] x:\dir\subdir\Test\TestComponent.cshtml) - input
                         HtmlAttribute - (70:2,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - onclick=" - "
                             CSharpExpressionAttributeValue -  - 
                                 IntermediateToken -  - CSharp - Microsoft.AspNetCore.Components.EventCallback.Factory.Create<Microsoft.AspNetCore.Components.Web.MouseEventArgs>(this, 
                                 LazyIntermediateToken - (70:2,19 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - OnClick
                                 IntermediateToken -  - CSharp - )
-                    HtmlContent - (79:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (79:2,28 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (96:4,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
                 LazyIntermediateToken - (96:4,7 [31] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    void OnClick() {\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt
index a0d0ac06fa..5080afe9e6 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/EventHandler_OnElement_WithoutCloseTag/TestComponent.mappings.txt
@@ -3,7 +3,7 @@ Source Location: (96:4,7 [31] x:\dir\subdir\Test\TestComponent.cshtml)
     void OnClick() {
     }
 |
-Generated Location: (1417:41,7 [31] )
+Generated Location: (1311:39,7 [31] )
 |
     void OnClick() {
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
index d8a7967fa3..dcab0dfd43 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.codegen.cs
@@ -22,9 +22,8 @@ namespace Test
 #line hidden
 #nullable disable
             , 2, (context) => (__builder2) => {
-                __builder2.AddMarkupContent(3, "\r\n  ");
-                __builder2.OpenElement(4, "div");
-                __builder2.AddContent(5, 
+                __builder2.OpenElement(3, "div");
+                __builder2.AddContent(4, 
 #nullable restore
 #line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
         context.ToLower()
@@ -34,7 +33,6 @@ namespace Test
 #nullable disable
                 );
                 __builder2.CloseElement();
-                __builder2.AddMarkupContent(6, "\r\n");
             }
             );
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
index 5067b01f20..5a841a91e9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/GenericComponent_WithFullyQualifiedTagName/TestComponent.ir.txt
@@ -9,13 +9,9 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 Component - (0:0,0 [87] x:\dir\subdir\Test\TestComponent.cshtml) - Test.MyComponent
                     ComponentChildContent -  - ChildContent - context
-                        HtmlContent - (33:0,33 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                            LazyIntermediateToken - (33:0,33 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n  
                         MarkupElement - (37:1,2 [29] x:\dir\subdir\Test\TestComponent.cshtml) - div
                             CSharpExpression - (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
                                 LazyIntermediateToken - (43:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - context.ToLower()
-                        HtmlContent - (66:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                            LazyIntermediateToken - (66:1,31 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                     ComponentAttribute - (24:0,24 [7] x:\dir\subdir\Test\TestComponent.cshtml) - Item - Item - AttributeStructure.DoubleQuotes
                         CSharpExpression - (25:0,25 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                             LazyIntermediateToken - (26:0,26 [4] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hi"
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
index 324adf9e46..254f087964 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.codegen.cs
@@ -14,9 +14,37 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenComponent<Test.SomeOtherComponent>(0);
+            __builder.AddAttribute(1, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
+                __builder2.OpenElement(2, "h1");
+                __builder2.AddContent(3, "Child content at ");
+                __builder2.AddContent(4, 
+#nullable restore
+#line 2 "x:\dir\subdir\Test\TestComponent.cshtml"
+                          DateTime.Now
+
+#line default
+#line hidden
+#nullable disable
+                );
+                __builder2.CloseElement();
+                __builder2.AddMarkupContent(5, "\r\n    ");
+                __builder2.OpenElement(6, "p");
+                __builder2.AddContent(7, "Very ");
+                __builder2.AddContent(8, 
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+              "good"
+
+#line default
+#line hidden
+#nullable disable
+                );
+                __builder2.CloseElement();
+            }
+            ));
             __builder.CloseComponent();
-            __builder.AddMarkupContent(1, "\r\n\r\n");
-            __builder.AddMarkupContent(2, "<h1>Hello</h1>");
+            __builder.AddMarkupContent(9, "\r\n\r\n");
+            __builder.AddMarkupContent(10, "<h1>Hello</h1>");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
index c384e3090e..af6b0d3e19 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/LeadingWhiteSpace_WithComponent/TestComponent.ir.txt
@@ -7,7 +7,20 @@ Document -
         UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
-                Component - (0:0,0 [22] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent
-                HtmlContent - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    LazyIntermediateToken - (22:0,22 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
+                Component - (0:0,0 [115] x:\dir\subdir\Test\TestComponent.cshtml) - SomeOtherComponent
+                    ComponentChildContent -  - ChildContent - context
+                        MarkupElement - (26:1,4 [39] x:\dir\subdir\Test\TestComponent.cshtml) - h1
+                            HtmlContent - (30:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml)
+                                LazyIntermediateToken - (30:1,8 [17] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Child content at 
+                            CSharpExpression - (48:1,26 [12] x:\dir\subdir\Test\TestComponent.cshtml)
+                                LazyIntermediateToken - (48:1,26 [12] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - DateTime.Now
+                        HtmlContent - (65:1,43 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                            LazyIntermediateToken - (65:1,43 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                        MarkupElement - (71:2,4 [21] x:\dir\subdir\Test\TestComponent.cshtml) - p
+                            HtmlContent - (74:2,7 [5] x:\dir\subdir\Test\TestComponent.cshtml)
+                                LazyIntermediateToken - (74:2,7 [5] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Very 
+                            CSharpExpression - (81:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                                LazyIntermediateToken - (81:2,14 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "good"
+                HtmlContent - (115:3,21 [4] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (115:3,21 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n\n
                 MarkupBlock -  - <h1>Hello</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
index a1ea2a2c22..f74394ce80 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.codegen.cs
@@ -31,7 +31,6 @@ namespace Test
 #line hidden
 #nullable disable
             );
-            __builder.AddMarkupContent(2, "  ");
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
index fdad6f0a3e..93ebc966c1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/MarkupComment_IsNotIncluded/TestComponent.ir.txt
@@ -12,4 +12,3 @@ Document -
                 MarkupElement - (44:3,0 [38] x:\dir\subdir\Test\TestComponent.cshtml) - div
                     CSharpExpression - (50:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml)
                         LazyIntermediateToken - (50:3,6 [7] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - myValue
-                    MarkupBlock -  -   
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
index 1a54116eb4..552605fd8f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.codegen.cs
@@ -45,8 +45,7 @@ namespace Test
 #nullable disable
             __builder.OpenComponent<Test.MyComponent>(3);
             __builder.AddAttribute(4, "ChildContent", (Microsoft.AspNetCore.Components.RenderFragment)((__builder2) => {
-                __builder2.AddMarkupContent(5, "\r\n");
-                __builder2.AddContent(6, 
+                __builder2.AddContent(5, 
 #nullable restore
 #line 5 "x:\dir\subdir\Test\TestComponent.cshtml"
   "hello, world!"
@@ -55,7 +54,6 @@ namespace Test
 #line hidden
 #nullable disable
                 );
-                __builder2.AddMarkupContent(7, "\r\n");
             }
             ));
             __builder.CloseComponent();
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
index 881808d4ff..4d0759767a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.ir.txt
@@ -19,11 +19,7 @@ Document -
                     LazyIntermediateToken - (93:1,89 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - ;\n
                 Component - (99:3,0 [49] x:\dir\subdir\Test\TestComponent.cshtml) - MyComponent
                     ComponentChildContent -  - ChildContent - context
-                        HtmlContent - (112:3,13 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                            LazyIntermediateToken - (112:3,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                         CSharpExpression - (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml)
                             LazyIntermediateToken - (116:4,2 [15] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - "hello, world!"
-                        HtmlContent - (132:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                            LazyIntermediateToken - (132:4,18 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
             CSharpCode - (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
                 LazyIntermediateToken - (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    class Person\n    {\n        public string Name { get; set; }\n    }\n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
index ad61d61350..ed0c4af062 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/RazorTemplate_FollowedByComponent/TestComponent.mappings.txt
@@ -19,7 +19,7 @@ Source Location: (159:7,7 [76] x:\dir\subdir\Test\TestComponent.cshtml)
         public string Name { get; set; }
     }
 |
-Generated Location: (2207:65,7 [76] )
+Generated Location: (2093:63,7 [76] )
 |
     class Person
     {
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
index 11af4cefd1..a4085edb4a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.codegen.cs
@@ -14,13 +14,11 @@ namespace Test
         protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
         {
             __builder.OpenElement(0, "div");
-            __builder.AddMarkupContent(1, "\r\n    ");
-            __builder.OpenElement(2, "script");
-            __builder.AddAttribute(3, "src", "some/url.js");
-            __builder.AddAttribute(4, "anotherattribute", true);
-            __builder.AddMarkupContent(5, "\r\n        some text\r\n        some more text\r\n    ");
+            __builder.OpenElement(1, "script");
+            __builder.AddAttribute(2, "src", "some/url.js");
+            __builder.AddAttribute(3, "anotherattribute", true);
+            __builder.AddMarkupContent(4, "\r\n        some text\r\n        some more text\r\n    ");
             __builder.CloseElement();
-            __builder.AddMarkupContent(6, "\r\n");
             __builder.CloseElement();
         }
         #pragma warning restore 1998
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
index 8f4611599c..4ba08cf728 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/ScriptTag_WithErrorSuppressed/TestComponent.ir.txt
@@ -8,8 +8,6 @@ Document -
         ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 MarkupElement - (0:0,0 [144] x:\dir\subdir\Test\TestComponent.cshtml) - div
-                    HtmlContent - (5:0,5 [6] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (5:0,5 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
                     MarkupElement - (11:1,4 [125] x:\dir\subdir\Test\TestComponent.cshtml) - script
                         HtmlAttribute - (18:1,11 [18] x:\dir\subdir\Test\TestComponent.cshtml) -  src=' - '
                             HtmlAttributeValue - (24:1,17 [11] x:\dir\subdir\Test\TestComponent.cshtml) - 
@@ -17,5 +15,3 @@ Document -
                         HtmlAttribute - (36:1,29 [17] x:\dir\subdir\Test\TestComponent.cshtml) -  anotherattribute - 
                         HtmlContent - (78:1,71 [49] x:\dir\subdir\Test\TestComponent.cshtml)
                             LazyIntermediateToken - (78:1,71 [49] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n        some text\n        some more text\n    
-                    HtmlContent - (136:4,13 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                        LazyIntermediateToken - (136:4,13 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
index 16726f5372..5dfe18db34 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.codegen.cs
@@ -30,10 +30,9 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #line default
 #line hidden
 #nullable disable
-            __builder.AddContent(0, "    ");
-            __builder.OpenElement(1, "p");
-            __builder.AddContent(2, "Output: ");
-            __builder.AddContent(3, 
+            __builder.OpenElement(0, "p");
+            __builder.AddContent(1, "Output: ");
+            __builder.AddContent(2, 
 #nullable restore
 #line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
                 output
@@ -43,7 +42,6 @@ using Microsoft.AspNetCore.Components.RenderTree;
 #nullable disable
             );
             __builder.CloseElement();
-            __builder.AddMarkupContent(4, "\r\n");
         }
         #pragma warning restore 1998
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
index 5e1dc16963..1e62832776 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/SingleLineControlFlowStatements_InCodeBlock/TestComponent.ir.txt
@@ -10,14 +10,10 @@ Document -
             MethodDeclaration -  - protected override - void - BuildRenderTree
                 CSharpCode - (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml)
                     LazyIntermediateToken - (56:2,2 [134] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n    var output = string.Empty;\n    if (__builder == null) output = "Builder is null!";\n    else output = "Builder is not null!";\n
-                HtmlContent - (190:6,0 [4] x:\dir\subdir\Test\TestComponent.cshtml)
-                    LazyIntermediateToken - (190:6,0 [4] x:\dir\subdir\Test\TestComponent.cshtml) - Html -     
                 MarkupElement - (194:6,4 [22] x:\dir\subdir\Test\TestComponent.cshtml) - p
                     HtmlContent - (197:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml)
                         LazyIntermediateToken - (197:6,7 [8] x:\dir\subdir\Test\TestComponent.cshtml) - Html - Output: 
                     CSharpExpression - (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml)
                         LazyIntermediateToken - (206:6,16 [6] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - output
-                HtmlContent - (216:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml)
-                    LazyIntermediateToken - (216:6,26 [2] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n
                 CSharpCode - (218:7,0 [0] x:\dir\subdir\Test\TestComponent.cshtml)
                     LazyIntermediateToken - (218:7,0 [0] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - 
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.codegen.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.codegen.cs
new file mode 100644
index 0000000000..60146d6047
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.codegen.cs
@@ -0,0 +1,43 @@
+// <auto-generated/>
+#pragma warning disable 1591
+namespace Test
+{
+    #line hidden
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Components;
+    public partial class TestComponent : Microsoft.AspNetCore.Components.ComponentBase
+    {
+        #pragma warning disable 1998
+        protected override void BuildRenderTree(Microsoft.AspNetCore.Components.Rendering.RenderTreeBuilder __builder)
+        {
+            __builder.AddMarkupContent(0, "\r\n    ");
+            __builder.OpenElement(1, "elem");
+            __builder.AddAttribute(2, "attr", 
+#nullable restore
+#line 3 "x:\dir\subdir\Test\TestComponent.cshtml"
+                Foo
+
+#line default
+#line hidden
+#nullable disable
+            );
+            __builder.AddMarkupContent(3, "\r\n        <child></child>\r\n    ");
+            __builder.CloseElement();
+            __builder.AddMarkupContent(4, "\r\n\r\n\r\n");
+        }
+        #pragma warning restore 1998
+#nullable restore
+#line 7 "x:\dir\subdir\Test\TestComponent.cshtml"
+           
+        int Foo = 18;
+    
+
+#line default
+#line hidden
+#nullable disable
+    }
+}
+#pragma warning restore 1591
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.ir.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.ir.txt
new file mode 100644
index 0000000000..5a7148821b
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.ir.txt
@@ -0,0 +1,19 @@
+Document - 
+    NamespaceDeclaration -  - Test
+        UsingDirective - (3:1,1 [14] ) - System
+        UsingDirective - (18:2,1 [34] ) - System.Collections.Generic
+        UsingDirective - (53:3,1 [19] ) - System.Linq
+        UsingDirective - (73:4,1 [30] ) - System.Threading.Tasks
+        UsingDirective - (104:5,1 [39] ) - Microsoft.AspNetCore.Components
+        ClassDeclaration -  - public partial - TestComponent - Microsoft.AspNetCore.Components.ComponentBase - 
+            MethodDeclaration -  - protected override - void - BuildRenderTree
+                HtmlContent - (26:1,0 [6] x:\dir\subdir\Test\TestComponent.cshtml)
+                    LazyIntermediateToken - (26:1,0 [6] x:\dir\subdir\Test\TestComponent.cshtml) - Html - \n    
+                MarkupElement - (32:2,4 [48] x:\dir\subdir\Test\TestComponent.cshtml) - elem
+                    HtmlAttribute - (37:2,9 [10] x:\dir\subdir\Test\TestComponent.cshtml) -  attr= - 
+                        CSharpExpressionAttributeValue - (43:2,15 [4] x:\dir\subdir\Test\TestComponent.cshtml) - 
+                            LazyIntermediateToken - (44:2,16 [3] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - Foo
+                    MarkupBlock -  - \n        <child></child>\n    
+                MarkupBlock -  - \n\n\n
+            CSharpCode - (95:6,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+                LazyIntermediateToken - (95:6,11 [29] x:\dir\subdir\Test\TestComponent.cshtml) - CSharp - \n        int Foo = 18;\n    
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.mappings.txt b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.mappings.txt
new file mode 100644
index 0000000000..8aa5edb3fa
--- /dev/null
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/ComponentRuntimeCodeGenerationTest/WhiteSpace_WithPreserveWhitespace/TestComponent.mappings.txt
@@ -0,0 +1,9 @@
+Source Location: (95:6,11 [29] x:\dir\subdir\Test\TestComponent.cshtml)
+|
+        int Foo = 18;
+    |
+Generated Location: (1134:35,11 [29] )
+|
+        int Foo = 18;
+    |
+
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/Assert.cs b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/Assert.cs
index 8648ede045..6583ce89d0 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/Assert.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/Assert.cs
@@ -519,7 +519,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
         {
             using (var file = File.OpenRead(assemblyPath))
             {
-                var peReader = new PEReader(file);
+                using var peReader = new PEReader(file);
                 var metadataReader = peReader.GetMetadataReader();
                 return metadataReader.TypeDefinitions.Where(t => !t.IsNil).Select(t =>
                 {
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/Wasm/WasmPublishIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/Wasm/WasmPublishIntegrationTest.cs
index 0404757fcf..737639c2d9 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/Wasm/WasmPublishIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/integrationtests/Wasm/WasmPublishIntegrationTest.cs
@@ -8,8 +8,8 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Tasks;
 using Microsoft.AspNetCore.Testing;
 using Xunit;
-using ResourceHashesByNameDictionary = System.Collections.Generic.Dictionary<string, string>;
 using static Microsoft.AspNetCore.Razor.Design.IntegrationTests.ServiceWorkerAssert;
+using ResourceHashesByNameDictionary = System.Collections.Generic.Dictionary<string, string>;
 
 namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 {
@@ -60,6 +60,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 serviceWorkerPath: Path.Combine("serviceworkers", "my-service-worker.js"),
                 serviceWorkerContent: "// This is the production service worker",
                 assetsManifestPath: "custom-service-worker-assets.js");
+
+            VerifyTypeGranularTrimming(result, blazorPublishDirectory);
         }
 
         [Fact]
@@ -223,6 +225,10 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 serviceWorkerPath: Path.Combine("serviceworkers", "my-service-worker.js"),
                 serviceWorkerContent: "// This is the production service worker",
                 assetsManifestPath: "custom-service-worker-assets.js");
+
+            // Verify assemblies are not trimmed
+            var loggingAssemblyPath = Path.Combine(blazorPublishDirectory, "_framework", "Microsoft.Extensions.Logging.Abstractions.dll");
+            Assert.AssemblyContainsType(result, loggingAssemblyPath, "Microsoft.Extensions.Logging.Abstractions.NullLogger");
         }
 
         [Fact]
@@ -309,6 +315,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
                 serviceWorkerPath: Path.Combine("serviceworkers", "my-service-worker.js"),
                 serviceWorkerContent: "// This is the production service worker",
                 assetsManifestPath: "custom-service-worker-assets.js");
+
+            VerifyTypeGranularTrimming(result, blazorPublishDirectory);
         }
 
         [Fact]
@@ -695,6 +703,21 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
         }
 
+
+        private void VerifyTypeGranularTrimming(MSBuildResult result, string blazorPublishDirectory)
+        {
+            var loggingAssemblyPath = Path.Combine(blazorPublishDirectory, "_framework", "Microsoft.Extensions.Logging.Abstractions.dll");
+            Assert.FileExists(result, loggingAssemblyPath);
+
+            // ILogger is referenced by the app, so we expect it to be preserved
+            Assert.AssemblyContainsType(result, loggingAssemblyPath, "Microsoft.Extensions.Logging.ILogger");
+            // LogLevel is referenced by ILogger and therefore must be preserved.
+            Assert.AssemblyContainsType(result, loggingAssemblyPath, "Microsoft.Extensions.Logging.LogLevel");
+
+            // NullLogger is not referenced by the app, and should be trimmed.
+            Assert.AssemblyDoesNotContainType(result, loggingAssemblyPath, "Microsoft.Extensions.Logging.Abstractions.NullLogger");
+        }
+
         private static BootJsonData ReadBootJsonData(MSBuildResult result, string path)
         {
             return JsonSerializer.Deserialize<BootJsonData>(
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/CreateBlazorTrimmerRootDescriptorFile.cs b/src/Razor/Microsoft.NET.Sdk.Razor/src/CreateBlazorTrimmerRootDescriptorFile.cs
index 112d49a82b..0f36be8a9d 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/CreateBlazorTrimmerRootDescriptorFile.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/CreateBlazorTrimmerRootDescriptorFile.cs
@@ -1,8 +1,10 @@
 // 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;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Xml;
 using System.Xml.Linq;
 using Microsoft.Build.Framework;
@@ -21,16 +23,27 @@ namespace Microsoft.AspNetCore.Razor.Tasks
 
         public override bool Execute()
         {
-            using var fileStream = File.Create(TrimmerFile.ItemSpec);
+            var rootDescriptor = CreateRootDescriptorContents();
+            if (File.Exists(TrimmerFile.ItemSpec))
+            {
+                var existing = File.ReadAllText(TrimmerFile.ItemSpec);
 
-            WriteRootDescriptor(fileStream);
-            return true;
+                if (string.Equals(rootDescriptor, existing, StringComparison.Ordinal))
+                {
+                    Log.LogMessage(MessageImportance.Low, "Skipping write to file {0} because contents would not change.", TrimmerFile.ItemSpec);
+                    // Avoid writing if the file contents are identical. This is required for build incrementalism.
+                    return !Log.HasLoggedErrors;
+                }
+            }
+
+            File.WriteAllText(TrimmerFile.ItemSpec, rootDescriptor);
+            return !Log.HasLoggedErrors;
         }
 
-        internal void WriteRootDescriptor(Stream stream)
+        internal string CreateRootDescriptorContents()
         {
             var roots = new XElement("linker");
-            foreach (var assembly in Assemblies)
+            foreach (var assembly in Assemblies.OrderBy(a => a.ItemSpec))
             {
                 // NOTE: Descriptor files don't include the file extension
                 // in the assemblyName.
@@ -60,10 +73,7 @@ namespace Microsoft.AspNetCore.Razor.Tasks
                 OmitXmlDeclaration = true
             };
 
-            using var writer = XmlWriter.Create(stream, xmlWriterSettings);
-            var xDocument = new XDocument(roots);
-
-            xDocument.Save(writer);
+            return new XDocument(roots).Root.ToString();
         }
     }
 }
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets
index 1d293e3ef4..9c06ac8210 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets
@@ -18,10 +18,13 @@ Copyright (c) .NET Foundation. All rights reserved.
   <UsingTask TaskName="Microsoft.AspNetCore.Razor.Tasks.CreateBlazorTrimmerRootDescriptorFile" AssemblyFile="$(RazorSdkBuildTasksAssembly)" />
 
   <PropertyGroup>
-    <PublishTrimmed Condition="'$(PublishTrimmed)' == ''">true</PublishTrimmed>
     <SelfContained>true</SelfContained>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 
+    <!-- Trimmer defaults -->
+    <PublishTrimmed Condition="'$(PublishTrimmed)' == ''">true</PublishTrimmed>
+    <TrimMode Condition="'$(TrimMode)' == ''">link</TrimMode>
+
     <StaticWebAssetBasePath Condition="'$(StaticWebAssetBasePath)' == ''">/</StaticWebAssetBasePath>
     <BlazorCacheBootResources Condition="'$(BlazorCacheBootResources)' == ''">true</BlazorCacheBootResources>
 
@@ -46,14 +49,6 @@ Copyright (c) .NET Foundation. All rights reserved.
     <KnownFrameworkReference Remove="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
-  <!-- Temporary workaround until ILLink.targets are updated -->
-  <PropertyGroup Condition=" '$(PublishTrimmed)' == 'true' ">
-    <IntermediateLinkDir Condition=" '$(IntermediateLinkDir)' == '' ">$(IntermediateOutputPath)linked\</IntermediateLinkDir>
-    <IntermediateLinkDir Condition=" !HasTrailingSlash('$(IntermediateLinkDir)') ">$(IntermediateLinkDir)\</IntermediateLinkDir>
-    <!-- Used to enable incremental build for the linker target. -->
-    <_LinkSemaphore>$(IntermediateOutputPath)Link.semaphore</_LinkSemaphore>
-  </PropertyGroup>
-
   <Import Project="Microsoft.NET.Sdk.Razor.Components.ServiceWorkerAssetsManifest.targets" Condition="'$(ServiceWorkerAssetsManifest)' != ''" />
 
   <Target Name="_ScrambleDotnetJsFileName" AfterTargets="ResolveRuntimePackAssets">
@@ -312,18 +307,22 @@ Copyright (c) .NET Foundation. All rights reserved.
     </Copy>
   </Target>
 
-  <Target Name="_CreateBlazorTrimmerRootDescriptorFiles" BeforeTargets="ILLink" AfterTargets="ComputeResolvedFilesToPublishList">
+  <Target Name="_BlazorWasmPrepareForLink" BeforeTargets="PrepareForILLink">
     <PropertyGroup>
       <_BlazorTypeGranularTrimmerDescriptorFile>$(IntermediateOutputPath)typegranularity.trimmerdescriptor.xml</_BlazorTypeGranularTrimmerDescriptorFile>
     </PropertyGroup>
 
     <ItemGroup>
       <_BlazorTypeGranularAssembly
-          Include="@(ResolvedFileToPublish)"
+          Include="@(ManagedAssemblyToLink)"
           Condition="'%(Extension)' == '.dll' AND ($([System.String]::Copy('%(Filename)').StartsWith('Microsoft.AspNetCore.')) or $([System.String]::Copy('%(Filename)').StartsWith('Microsoft.Extensions.')))">
         <Required>false</Required>
         <Preserve>all</Preserve>
       </_BlazorTypeGranularAssembly>
+
+      <ManagedAssemblyToLink
+        IsTrimmable="true"
+        Condition="'%(Extension)' == '.dll' AND ($([System.String]::Copy('%(Filename)').StartsWith('Microsoft.AspNetCore.')) or $([System.String]::Copy('%(Filename)').StartsWith('Microsoft.Extensions.')))" />
     </ItemGroup>
 
     <CreateBlazorTrimmerRootDescriptorFile
diff --git a/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/MSN.cshtml b/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/MSN.cshtml
index 8b477688e0..1ad996767d 100644
--- a/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/MSN.cshtml
+++ b/src/Razor/perf/Microsoft.AspNetCore.Razor.Performance/MSN.cshtml
@@ -1,4 +1,4 @@
-
+
 <!DOCTYPE html><html prefix="og: http://ogp.me/ns# fb: http://ogp.me/ns/fb#"  lang="en-US"  style="font-size:62.5%"  class="hiperf"  dir="ltr" >
 
 <head data-info="v:2.0.5798.31020;a:cc7227b7-f7fe-4e3b-b644-226f3ef2c489;cn:125;az:{did:1f802c514e1c42e385b028b15ac20ce4, rid: 125, sn: westus-hp, dt: 2015-11-16T22:01:08.0825616Z, bt: 2015-11-17T01:14:47.5617874Z};ddpi:1;dpio:;dpi:1;dg:tmx.pc.webkit.chrome;th:start;PageName:startPage;m:en-us;cb:;l:en-us;mu:en-us;ud:{cid:,vk:homepage,n:,l:en-us,ck:};xd:AA3iOMG;ovc:f;al:;fxd:t;xdpub:2015-11-18 20:26:50Z;xdmap:2015-11-18 20:30:01Z;axd:;f:muidflt2cf,muidflt9-ismsft,d-thshldie1,d-thshldie2"  data-js="{&quot;dpi&quot;:1.0,&quot;ddpi&quot;:1.0,&quot;dpio&quot;:null,&quot;forcedpi&quot;:null,&quot;dms&quot;:6000,&quot;bds&quot;:7,&quot;dg&quot;:&quot;tmx.pc.webkit.chrome&quot;,&quot;ssl&quot;:false,&quot;moduleapi&quot;:&quot;http://www.msn.com/en-us/homepage/api/modules/fetch&quot;,&quot;cdnmoduleapi&quot;:&quot;http://static-hp-wus.s-msn.com/en-us/homepage/api/modules/cdnfetch&quot;,&quot;pdpdeltaupdateapi&quot;:&quot;http://www.msn.com/en-us/homepage/api/pdp/updatepdpdata&quot;,&quot;xd&quot;:&quot;aa3iomg&quot;,&quot;signedin&quot;:1,&quot;sso&quot;:&quot;&quot;,&quot;exchangeenabled&quot;:true,&quot;twitterimpenabled&quot;:true}"  data-client-settings="{&quot;geo_location&quot;:&quot;us&quot;,&quot;os_region&quot;:&quot;&quot;,&quot;apps_locale&quot;:&quot;&quot;,&quot;base_url&quot;:&quot;/en-us/homepage/&quot;,&quot;aid&quot;:&quot;cc7227b7f7fe4e3bb644226f3ef2c489&quot;,&quot;sid&quot;:null,&quot;v&quot;:&quot;2.0.5798.31020&quot;,&quot;static_page&quot;:false,&quot;fbid&quot;:&quot;132970837947&quot;,&quot;lvk&quot;:&quot;homepage&quot;,&quot;vk&quot;:&quot;homepage&quot;,&quot;cat&quot;:null,&quot;autorefresh&quot;:true,&quot;bingssl&quot;:false,&quot;autorefreshsettings&quot;:{&quot;is_market_enabled&quot;:false,&quot;timeout&quot;:0,&quot;idle_enabled&quot;:false,&quot;idle_timeout&quot;:&quot;2&quot;},&quot;uipr&quot;:true,&quot;uiprsettings&quot;:{&quot;enabled&quot;:true,&quot;frequency_minutes&quot;:&quot;5&quot;,&quot;banner_delay_minutes&quot;:null,&quot;maxfresh_display&quot;:null,&quot;minfresh_count&quot;:&quot;5&quot;,&quot;ajaxtimeoutinseconds&quot;:&quot;60&quot;},&quot;imgsrc&quot;:{&quot;quality_high&quot;:&quot;60&quot;,&quot;quality_low&quot;:&quot;5&quot;,&quot;order_timeout&quot;:&quot;1000&quot;},&quot;adsettings&quot;:{&quot;wait_for_ad_in_sec&quot;:&quot;3&quot;,&quot;retry_for_ad&quot;:&quot;2&quot;},&quot;mecontroluri&quot;:&quot;https://mem.gfx.ms/meversion/?partner=msn&amp;market=en-us&quot;,&quot;lazyload&quot;:{&quot;enabled&quot;:false,&quot;scroll_buffer&quot;:&quot;&quot;}}"  data-xd-id="AA3iOMG"  data-pdp-stale="true">
diff --git a/src/Razor/test/testassets/AppWithP2PReference/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Razor/test/testassets/AppWithP2PReference/Views/Shared/_ValidationScriptsPartial.cshtml
index a699aafa97..a2b13b317f 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/Razor/test/testassets/AppWithP2PReference/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,4 +1,4 @@
-<environment include="Development">
+<environment include="Development">
     <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
     <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
 </environment>
diff --git a/src/Razor/test/testassets/AppWithP2PReference/Views/_ViewImports.cshtml b/src/Razor/test/testassets/AppWithP2PReference/Views/_ViewImports.cshtml
index 601a427791..8cb41f77d6 100644
--- a/src/Razor/test/testassets/AppWithP2PReference/Views/_ViewImports.cshtml
+++ b/src/Razor/test/testassets/AppWithP2PReference/Views/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using AppWithP2PReference
+@using AppWithP2PReference
 @using AppWithP2PReference.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/ClassLibrary/Views/_ViewImports.cshtml b/src/Razor/test/testassets/ClassLibrary/Views/_ViewImports.cshtml
index 1dbbe8a4c2..1286807d40 100644
--- a/src/Razor/test/testassets/ClassLibrary/Views/_ViewImports.cshtml
+++ b/src/Razor/test/testassets/ClassLibrary/Views/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@using ClassLibrary
+@using ClassLibrary
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/ClassLibrary2/Views/_ViewImports.cshtml b/src/Razor/test/testassets/ClassLibrary2/Views/_ViewImports.cshtml
index 1dbbe8a4c2..1286807d40 100644
--- a/src/Razor/test/testassets/ClassLibrary2/Views/_ViewImports.cshtml
+++ b/src/Razor/test/testassets/ClassLibrary2/Views/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@using ClassLibrary
+@using ClassLibrary
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/ComponentApp/Components/Pages/Counter.razor b/src/Razor/test/testassets/ComponentApp/Components/Pages/Counter.razor
index 3e757725b6..a9b58de4f9 100644
--- a/src/Razor/test/testassets/ComponentApp/Components/Pages/Counter.razor
+++ b/src/Razor/test/testassets/ComponentApp/Components/Pages/Counter.razor
@@ -1,4 +1,4 @@
-@page "/counter"
+@page "/counter"
 
 <h1>Counter</h1>
 
diff --git a/src/Razor/test/testassets/ComponentApp/Components/Pages/FetchData.razor b/src/Razor/test/testassets/ComponentApp/Components/Pages/FetchData.razor
index be2bbde336..da0979081c 100644
--- a/src/Razor/test/testassets/ComponentApp/Components/Pages/FetchData.razor
+++ b/src/Razor/test/testassets/ComponentApp/Components/Pages/FetchData.razor
@@ -1,4 +1,4 @@
-@page "/fetchdata"
+@page "/fetchdata"
 @using ComponentApp.Services
 @inject WeatherForecastService ForecastService
 
diff --git a/src/Razor/test/testassets/ComponentApp/Components/Shared/NavMenu.razor b/src/Razor/test/testassets/ComponentApp/Components/Shared/NavMenu.razor
index a05cec10f0..02c4d40602 100644
--- a/src/Razor/test/testassets/ComponentApp/Components/Shared/NavMenu.razor
+++ b/src/Razor/test/testassets/ComponentApp/Components/Shared/NavMenu.razor
@@ -1,4 +1,4 @@
-<div class="top-row pl-4 navbar navbar-dark">
+<div class="top-row pl-4 navbar navbar-dark">
     <a class="navbar-brand" href="">ComponentApp</a>
     <button class="navbar-toggler" @onclick="@ToggleNavMenu">
         <span class="navbar-toggler-icon"></span>
diff --git a/src/Razor/test/testassets/ComponentApp/Components/_Imports.razor b/src/Razor/test/testassets/ComponentApp/Components/_Imports.razor
index d9b1efc333..64a5fdbb30 100644
--- a/src/Razor/test/testassets/ComponentApp/Components/_Imports.razor
+++ b/src/Razor/test/testassets/ComponentApp/Components/_Imports.razor
@@ -1,3 +1,3 @@
-@using ComponentApp.Components.Shared
+@using ComponentApp.Components.Shared
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.AspNetCore.Components.Web
diff --git a/src/Razor/test/testassets/ComponentLibrary/GenericComponent.razor b/src/Razor/test/testassets/ComponentLibrary/GenericComponent.razor
index cccb68d017..a2890427c7 100644
--- a/src/Razor/test/testassets/ComponentLibrary/GenericComponent.razor
+++ b/src/Razor/test/testassets/ComponentLibrary/GenericComponent.razor
@@ -1,4 +1,4 @@
-@typeparam TItem
+@typeparam TItem
 
 <h1>@Title - @Item</h1>
 
diff --git a/src/Razor/test/testassets/ComponentLibrary/MyComponent.razor b/src/Razor/test/testassets/ComponentLibrary/MyComponent.razor
index e1a56ee3ae..0602164bfb 100644
--- a/src/Razor/test/testassets/ComponentLibrary/MyComponent.razor
+++ b/src/Razor/test/testassets/ComponentLibrary/MyComponent.razor
@@ -1 +1 @@
-<GenericComponent Item="17" Title="nameof(Class1)" />
\ No newline at end of file
+<GenericComponent Item="17" Title="nameof(Class1)" />
\ No newline at end of file
diff --git a/src/Razor/test/testassets/LargeProject/Views/Home/View000.cshtml b/src/Razor/test/testassets/LargeProject/Views/Home/View000.cshtml
index 3b3157002e..77908e31bb 100644
--- a/src/Razor/test/testassets/LargeProject/Views/Home/View000.cshtml
+++ b/src/Razor/test/testassets/LargeProject/Views/Home/View000.cshtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8" />
diff --git a/src/Razor/test/testassets/LargeProject/Views/Shared/_Layout.cshtml b/src/Razor/test/testassets/LargeProject/Views/Shared/_Layout.cshtml
index 694a3223d1..8b5a9ba634 100644
--- a/src/Razor/test/testassets/LargeProject/Views/Shared/_Layout.cshtml
+++ b/src/Razor/test/testassets/LargeProject/Views/Shared/_Layout.cshtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8" />
diff --git a/src/Razor/test/testassets/LargeProject/Views/Shared/_ViewImports.cshtml b/src/Razor/test/testassets/LargeProject/Views/Shared/_ViewImports.cshtml
index 46477e769f..629ae0c952 100644
--- a/src/Razor/test/testassets/LargeProject/Views/Shared/_ViewImports.cshtml
+++ b/src/Razor/test/testassets/LargeProject/Views/Shared/_ViewImports.cshtml
@@ -1,2 +1,2 @@
-@using LargeProject
+@using LargeProject
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/LinkedDir/LinkedErrorFile.cshtml b/src/Razor/test/testassets/LinkedDir/LinkedErrorFile.cshtml
index 2567b2c379..8a21ffc3a0 100644
--- a/src/Razor/test/testassets/LinkedDir/LinkedErrorFile.cshtml
+++ b/src/Razor/test/testassets/LinkedDir/LinkedErrorFile.cshtml
@@ -1 +1 @@
-@(
\ No newline at end of file
+@(
\ No newline at end of file
diff --git a/src/Razor/test/testassets/LinkedDir/LinkedFile.cshtml b/src/Razor/test/testassets/LinkedDir/LinkedFile.cshtml
index 3611531b13..07d975bab8 100644
--- a/src/Razor/test/testassets/LinkedDir/LinkedFile.cshtml
+++ b/src/Razor/test/testassets/LinkedDir/LinkedFile.cshtml
@@ -1 +1 @@
-@DateTime.UtcNow
\ No newline at end of file
+@DateTime.UtcNow
\ No newline at end of file
diff --git a/src/Razor/test/testassets/LinkedDir/LinkedFile2.cshtml b/src/Razor/test/testassets/LinkedDir/LinkedFile2.cshtml
index 3611531b13..07d975bab8 100644
--- a/src/Razor/test/testassets/LinkedDir/LinkedFile2.cshtml
+++ b/src/Razor/test/testassets/LinkedDir/LinkedFile2.cshtml
@@ -1 +1 @@
-@DateTime.UtcNow
\ No newline at end of file
+@DateTime.UtcNow
\ No newline at end of file
diff --git a/src/Razor/test/testassets/LinkedDir/LinkedFile3.cshtml b/src/Razor/test/testassets/LinkedDir/LinkedFile3.cshtml
index 3611531b13..07d975bab8 100644
--- a/src/Razor/test/testassets/LinkedDir/LinkedFile3.cshtml
+++ b/src/Razor/test/testassets/LinkedDir/LinkedFile3.cshtml
@@ -1 +1 @@
-@DateTime.UtcNow
\ No newline at end of file
+@DateTime.UtcNow
\ No newline at end of file
diff --git a/src/Razor/test/testassets/MvcWithComponents/Components/Counter.razor b/src/Razor/test/testassets/MvcWithComponents/Components/Counter.razor
index f8b81d88c7..3cfe9ce138 100644
--- a/src/Razor/test/testassets/MvcWithComponents/Components/Counter.razor
+++ b/src/Razor/test/testassets/MvcWithComponents/Components/Counter.razor
@@ -1 +1 @@
-This file should produce a component
+This file should produce a component
diff --git a/src/Razor/test/testassets/MvcWithComponents/TestComponent.razor b/src/Razor/test/testassets/MvcWithComponents/TestComponent.razor
index 558c8aaa24..5915dc3fa4 100644
--- a/src/Razor/test/testassets/MvcWithComponents/TestComponent.razor
+++ b/src/Razor/test/testassets/MvcWithComponents/TestComponent.razor
@@ -1 +1 @@
-Hello from component
\ No newline at end of file
+Hello from component
\ No newline at end of file
diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/Home/#FileName.cshtml b/src/Razor/test/testassets/MvcWithComponents/Views/Home/#FileName.cshtml
index c227f7c471..ec43b10523 100644
--- a/src/Razor/test/testassets/MvcWithComponents/Views/Home/#FileName.cshtml
+++ b/src/Razor/test/testassets/MvcWithComponents/Views/Home/#FileName.cshtml
@@ -1 +1 @@
-@page "/filename"
+@page "/filename"
diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/Shared/NavMenu.razor b/src/Razor/test/testassets/MvcWithComponents/Views/Shared/NavMenu.razor
index e036fead2b..74fb75f709 100644
--- a/src/Razor/test/testassets/MvcWithComponents/Views/Shared/NavMenu.razor
+++ b/src/Razor/test/testassets/MvcWithComponents/Views/Shared/NavMenu.razor
@@ -1,4 +1,4 @@
-@Test.Foo @* Used in a test. Don't remove *@
+@Test.Foo @* Used in a test. Don't remove *@
 
 NavMenu content
 
diff --git a/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml b/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml
index b570117928..7145371ebf 100644
--- a/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml
+++ b/src/Razor/test/testassets/MvcWithComponents/Views/_ViewImports.cshtml
@@ -1,4 +1,4 @@
-@using MvcWithComponents
+@using MvcWithComponents
 @using MvcWithComponents.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @inject DateTime TheTime
diff --git a/src/Razor/test/testassets/SimpleMvc/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Razor/test/testassets/SimpleMvc/Views/Shared/_ValidationScriptsPartial.cshtml
index a699aafa97..a2b13b317f 100644
--- a/src/Razor/test/testassets/SimpleMvc/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/Razor/test/testassets/SimpleMvc/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,4 +1,4 @@
-<environment include="Development">
+<environment include="Development">
     <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
     <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
 </environment>
diff --git a/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml
index 26ba8ed20e..e37656afde 100644
--- a/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml
+++ b/src/Razor/test/testassets/SimpleMvc/Views/_ViewImports.cshtml
@@ -1,4 +1,4 @@
-@using SimpleMvc
+@using SimpleMvc
 @using SimpleMvc.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @inject DateTime TheTime
diff --git a/src/Razor/test/testassets/SimpleMvc21/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Razor/test/testassets/SimpleMvc21/Views/Shared/_ValidationScriptsPartial.cshtml
index a699aafa97..a2b13b317f 100644
--- a/src/Razor/test/testassets/SimpleMvc21/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/Razor/test/testassets/SimpleMvc21/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,4 +1,4 @@
-<environment include="Development">
+<environment include="Development">
     <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
     <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
 </environment>
diff --git a/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml b/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml
index c8d7fa63cc..6380cfcd6f 100644
--- a/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml
+++ b/src/Razor/test/testassets/SimpleMvc21/Views/_ViewImports.cshtml
@@ -1,4 +1,4 @@
-@using SimpleMvc
+@using SimpleMvc
 @using SimpleMvc.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @namespace SimpleMvc21
diff --git a/src/Razor/test/testassets/SimpleMvc31/Views/Home/Index.cshtml b/src/Razor/test/testassets/SimpleMvc31/Views/Home/Index.cshtml
index 52ffe012e4..d2d19bdf9f 100644
--- a/src/Razor/test/testassets/SimpleMvc31/Views/Home/Index.cshtml
+++ b/src/Razor/test/testassets/SimpleMvc31/Views/Home/Index.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
     ViewData["Title"] = "Home Page";
 }
 
diff --git a/src/Razor/test/testassets/SimpleMvc31/Views/Shared/Error.cshtml b/src/Razor/test/testassets/SimpleMvc31/Views/Shared/Error.cshtml
index 0c47bb0deb..a1e04783c6 100644
--- a/src/Razor/test/testassets/SimpleMvc31/Views/Shared/Error.cshtml
+++ b/src/Razor/test/testassets/SimpleMvc31/Views/Shared/Error.cshtml
@@ -1,4 +1,4 @@
-@model ErrorViewModel
+@model ErrorViewModel
 @{
     ViewData["Title"] = "Error";
 }
diff --git a/src/Razor/test/testassets/SimpleMvc31/Views/_ViewStart.cshtml b/src/Razor/test/testassets/SimpleMvc31/Views/_ViewStart.cshtml
index 820a2f6e02..a5f10045db 100644
--- a/src/Razor/test/testassets/SimpleMvc31/Views/_ViewStart.cshtml
+++ b/src/Razor/test/testassets/SimpleMvc31/Views/_ViewStart.cshtml
@@ -1,3 +1,3 @@
-@{
+@{
     Layout = "_Layout";
 }
diff --git a/src/Razor/test/testassets/SimplePages/Areas/Products/Pages/_ViewImports.cshtml b/src/Razor/test/testassets/SimplePages/Areas/Products/Pages/_ViewImports.cshtml
index 6686959c4a..2e98496b7f 100644
--- a/src/Razor/test/testassets/SimplePages/Areas/Products/Pages/_ViewImports.cshtml
+++ b/src/Razor/test/testassets/SimplePages/Areas/Products/Pages/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using SimplePages
+@using SimplePages
 @namespace SimplePages.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/SimplePages/Pages/_Layout.cshtml b/src/Razor/test/testassets/SimplePages/Pages/_Layout.cshtml
index 694a3223d1..8b5a9ba634 100644
--- a/src/Razor/test/testassets/SimplePages/Pages/_Layout.cshtml
+++ b/src/Razor/test/testassets/SimplePages/Pages/_Layout.cshtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8" />
diff --git a/src/Razor/test/testassets/SimplePages/Pages/_ViewImports.cshtml b/src/Razor/test/testassets/SimplePages/Pages/_ViewImports.cshtml
index 6686959c4a..2e98496b7f 100644
--- a/src/Razor/test/testassets/SimplePages/Pages/_ViewImports.cshtml
+++ b/src/Razor/test/testassets/SimplePages/Pages/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using SimplePages
+@using SimplePages
 @namespace SimplePages.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Razor/test/testassets/blazorwasm/Program.cs b/src/Razor/test/testassets/blazorwasm/Program.cs
index 4b20dea9de..0784957aff 100644
--- a/src/Razor/test/testassets/blazorwasm/Program.cs
+++ b/src/Razor/test/testassets/blazorwasm/Program.cs
@@ -8,6 +8,7 @@ namespace standalone
         {
             GC.KeepAlive(typeof(System.Text.Json.JsonSerializer));
             GC.KeepAlive(typeof(RazorClassLibrary.Class1));
+            GC.KeepAlive(typeof(Microsoft.Extensions.Logging.ILogger));
 #if REFERENCE_classlibrarywithsatelliteassemblies
             GC.KeepAlive(typeof(classlibrarywithsatelliteassemblies.Class1));
 #endif
diff --git a/src/Razor/test/testassets/blazorwasm/blazorwasm.csproj b/src/Razor/test/testassets/blazorwasm/blazorwasm.csproj
index 724a4365b5..36a511e7c7 100644
--- a/src/Razor/test/testassets/blazorwasm/blazorwasm.csproj
+++ b/src/Razor/test/testassets/blazorwasm/blazorwasm.csproj
@@ -26,6 +26,14 @@
     <ProjectReference Include="..\razorclasslibrary\RazorClassLibrary.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <!--
+      We need a Microsoft.* package to verify type granular trimming. We'll pick a fixed version to we can bake in some details about
+      the contents of the package in our tests.
+    -->
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <!-- These assets should be treated as static web assets for publish purposes -->
     <Content Include="..\LinkBaseToWebRoot\**\*.js">
diff --git a/src/Security/samples/ClaimsTransformation/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Security/samples/ClaimsTransformation/Views/Shared/_ValidationScriptsPartial.cshtml
index a699aafa97..a2b13b317f 100644
--- a/src/Security/samples/ClaimsTransformation/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/Security/samples/ClaimsTransformation/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,4 +1,4 @@
-<environment include="Development">
+<environment include="Development">
     <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
     <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
 </environment>
diff --git a/src/Security/samples/ClaimsTransformation/Views/_ViewImports.cshtml b/src/Security/samples/ClaimsTransformation/Views/_ViewImports.cshtml
index 276589ff47..eff50c96fe 100644
--- a/src/Security/samples/ClaimsTransformation/Views/_ViewImports.cshtml
+++ b/src/Security/samples/ClaimsTransformation/Views/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using AuthSamples.ClaimsTransformer
+@using AuthSamples.ClaimsTransformer
 @using AuthSamples.ClaimsTransformer.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Security/samples/Cookies/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Security/samples/Cookies/Views/Shared/_ValidationScriptsPartial.cshtml
index a699aafa97..a2b13b317f 100644
--- a/src/Security/samples/Cookies/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/Security/samples/Cookies/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,4 +1,4 @@
-<environment include="Development">
+<environment include="Development">
     <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
     <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
 </environment>
diff --git a/src/Security/samples/Cookies/Views/_ViewImports.cshtml b/src/Security/samples/Cookies/Views/_ViewImports.cshtml
index ad64ae2538..34832a1ed6 100644
--- a/src/Security/samples/Cookies/Views/_ViewImports.cshtml
+++ b/src/Security/samples/Cookies/Views/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using AuthSamples.Cookies
+@using AuthSamples.Cookies
 @using AuthSamples.Cookies.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Security/samples/CustomPolicyProvider/Views/Account/Signin.cshtml b/src/Security/samples/CustomPolicyProvider/Views/Account/Signin.cshtml
index 84dbc2a24d..4c6a07744c 100644
--- a/src/Security/samples/CustomPolicyProvider/Views/Account/Signin.cshtml
+++ b/src/Security/samples/CustomPolicyProvider/Views/Account/Signin.cshtml
@@ -1,4 +1,4 @@
-<h1>Sign In</h1>
+<h1>Sign In</h1>
 <div>
     <form asp-controller="Account" asp-action="Signin" asp-route-returnurl="@ViewData["ReturnUrl"]" method="post">
         <div>
diff --git a/src/Security/samples/DynamicSchemes/Pages/_Layout.cshtml b/src/Security/samples/DynamicSchemes/Pages/_Layout.cshtml
index b7f802d5c3..6aaad6adbe 100644
--- a/src/Security/samples/DynamicSchemes/Pages/_Layout.cshtml
+++ b/src/Security/samples/DynamicSchemes/Pages/_Layout.cshtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8" />
diff --git a/src/Security/samples/DynamicSchemes/Pages/_ViewImports.cshtml b/src/Security/samples/DynamicSchemes/Pages/_ViewImports.cshtml
index f967ec1218..3a77f24c91 100644
--- a/src/Security/samples/DynamicSchemes/Pages/_ViewImports.cshtml
+++ b/src/Security/samples/DynamicSchemes/Pages/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using AuthSamples.DynamicSchemes
+@using AuthSamples.DynamicSchemes
 @namespace DynamicSchemes.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/Account/AccessDenied.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/Account/AccessDenied.cshtml
index ba7d0215dc..b2c0be3439 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/Account/AccessDenied.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/Account/AccessDenied.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model AccessDeniedModel
 @{
     ViewData["Title"] = "Access denied";
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/Account/ConfirmEmail.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/Account/ConfirmEmail.cshtml
index 903896477c..401bf32451 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/Account/ConfirmEmail.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/Account/ConfirmEmail.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ConfirmEmailModel
 @{
     ViewData["Title"] = "Confirm email";
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/Account/ExternalLogin.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/Account/ExternalLogin.cshtml
index 51c9b9264f..d7784bc9de 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/Account/ExternalLogin.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/Account/ExternalLogin.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ExternalLoginModel
 @{
     ViewData["Title"] = "Register";
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/Account/ForgotPassword.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/Account/ForgotPassword.cshtml
index cd8e98cf44..d733bb72f8 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/Account/ForgotPassword.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/Account/ForgotPassword.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ForgotPasswordModel
 @{
     ViewData["Title"] = "Forgot your password?";
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/Account/Login.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/Account/Login.cshtml
index a486f27545..dd4c9f799d 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/Account/Login.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/Account/Login.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model LoginModel
 
 @{
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/ChangePassword.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/ChangePassword.cshtml
index 7070c8c340..57516c3b21 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/ChangePassword.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/ChangePassword.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ChangePasswordModel
 @{
     ViewData["Title"] = "Change password";
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/Index.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/Index.cshtml
index 681c9ec3ca..df7264a708 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/Index.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/Index.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model IndexModel
 @{
     ViewData["Title"] = "Profile";
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/SetPassword.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/SetPassword.cshtml
index b80e15ecca..e6b8a1aef2 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/SetPassword.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/SetPassword.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model SetPasswordModel
 @{
     ViewData["Title"] = "Set password";
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/TwoFactorAuthentication.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/TwoFactorAuthentication.cshtml
index fabe1999e6..92f3803c3e 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/TwoFactorAuthentication.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/TwoFactorAuthentication.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model TwoFactorAuthenticationModel
 @{
     ViewData["Title"] = "Two-factor authentication (2FA)";
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/_ViewImports.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/_ViewImports.cshtml
index 6c3fab186b..aae4e1cab9 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/_ViewImports.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/Account/Manage/_ViewImports.cshtml
@@ -1 +1 @@
-@using Identity.ExternalClaims.Pages.Account.Manage
+@using Identity.ExternalClaims.Pages.Account.Manage
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/Account/Register.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/Account/Register.cshtml
index 64f2151518..17106735df 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/Account/Register.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/Account/Register.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model RegisterModel
 @{
     ViewData["Title"] = "Register";
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/Account/ResetPassword.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/Account/ResetPassword.cshtml
index 85a81b1ef5..dd1f8f1944 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/Account/ResetPassword.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/Account/ResetPassword.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model ResetPasswordModel
 @{
     ViewData["Title"] = "Reset password";
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/Account/SignedOut.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/Account/SignedOut.cshtml
index 66ee2c8595..de38e2fde4 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/Account/SignedOut.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/Account/SignedOut.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @model SignedOutModel
 @{
     ViewData["Title"] = "Signed out";
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/Account/_ViewImports.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/Account/_ViewImports.cshtml
index 8b27d69cdd..c2407abff9 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/Account/_ViewImports.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/Account/_ViewImports.cshtml
@@ -1 +1 @@
-@using Identity.ExternalClaims.Pages.Account
+@using Identity.ExternalClaims.Pages.Account
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/MyClaims.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/MyClaims.cshtml
index 1c23c044c7..0a7ca764e0 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/MyClaims.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/MyClaims.cshtml
@@ -1,4 +1,4 @@
-@page
+@page
 @using Microsoft.AspNetCore.Authentication;
 @model MyClaimsModel
 @{
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/_LoginPartial.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/_LoginPartial.cshtml
index b6a8b70949..8b0f957d7d 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/_LoginPartial.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/_LoginPartial.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Identity
+@using Microsoft.AspNetCore.Identity
 @using Identity.ExternalClaims.Data
 @inject SignInManager<ApplicationUser> SignInManager
 @inject UserManager<ApplicationUser> UserManager
diff --git a/src/Security/samples/Identity.ExternalClaims/Pages/_ViewImports.cshtml b/src/Security/samples/Identity.ExternalClaims/Pages/_ViewImports.cshtml
index cb25c680ff..08cee916c2 100644
--- a/src/Security/samples/Identity.ExternalClaims/Pages/_ViewImports.cshtml
+++ b/src/Security/samples/Identity.ExternalClaims/Pages/_ViewImports.cshtml
@@ -1,4 +1,4 @@
-@using Microsoft.AspNetCore.Identity
+@using Microsoft.AspNetCore.Identity
 @using Identity.ExternalClaims
 @using Identity.ExternalClaims.Data
 @namespace Identity.ExternalClaims.Pages
diff --git a/src/Security/samples/PathSchemeSelection/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Security/samples/PathSchemeSelection/Views/Shared/_ValidationScriptsPartial.cshtml
index a699aafa97..a2b13b317f 100644
--- a/src/Security/samples/PathSchemeSelection/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/Security/samples/PathSchemeSelection/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,4 +1,4 @@
-<environment include="Development">
+<environment include="Development">
     <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
     <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
 </environment>
diff --git a/src/Security/samples/PathSchemeSelection/Views/_ViewImports.cshtml b/src/Security/samples/PathSchemeSelection/Views/_ViewImports.cshtml
index b13949eff0..e050462300 100644
--- a/src/Security/samples/PathSchemeSelection/Views/_ViewImports.cshtml
+++ b/src/Security/samples/PathSchemeSelection/Views/_ViewImports.cshtml
@@ -1,3 +1,3 @@
-@using AuthSamples.PathSchemeSelection
+@using AuthSamples.PathSchemeSelection
 @using AuthSamples.PathSchemeSelection.Models
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
diff --git a/src/Security/samples/StaticFilesAuth/Views/Shared/_LoginPartial.cshtml b/src/Security/samples/StaticFilesAuth/Views/Shared/_LoginPartial.cshtml
index 41f0839c32..549197ea1d 100644
--- a/src/Security/samples/StaticFilesAuth/Views/Shared/_LoginPartial.cshtml
+++ b/src/Security/samples/StaticFilesAuth/Views/Shared/_LoginPartial.cshtml
@@ -1,4 +1,4 @@
-
+
 @if (User.Identity.IsAuthenticated)
 {
     <form asp-controller="Account" asp-action="Logout" asp-route-returnUrl="@Url.Action("Index", "Home", new { area = "" })" method="post" id="logoutForm" class="navbar-right">
diff --git a/src/Security/samples/StaticFilesAuth/Views/Shared/_ValidationScriptsPartial.cshtml b/src/Security/samples/StaticFilesAuth/Views/Shared/_ValidationScriptsPartial.cshtml
index a699aafa97..a2b13b317f 100644
--- a/src/Security/samples/StaticFilesAuth/Views/Shared/_ValidationScriptsPartial.cshtml
+++ b/src/Security/samples/StaticFilesAuth/Views/Shared/_ValidationScriptsPartial.cshtml
@@ -1,4 +1,4 @@
-<environment include="Development">
+<environment include="Development">
     <script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
     <script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
 </environment>
diff --git a/src/Shared/ErrorPage/Views/ErrorPage.cshtml b/src/Shared/ErrorPage/Views/ErrorPage.cshtml
index 6eda70931e..094301f3c4 100644
--- a/src/Shared/ErrorPage/Views/ErrorPage.cshtml
+++ b/src/Shared/ErrorPage/Views/ErrorPage.cshtml
@@ -1,4 +1,4 @@
-@using System
+@using System
 @using System.Globalization
 @using System.Linq
 @using System.Net