diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 3113cbd68c7a..10da1f76dc1e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -13,313 +13,313 @@
       <Uri>https://github.com/dotnet/blazor</Uri>
       <Sha>cc449601d638ffaab58ae9487f0fd010bb178a12</Sha>
     </Dependency>
-    <Dependency Name="dotnet-ef" Version="5.0.0-rc.1.20419.5">
+    <Dependency Name="dotnet-ef" Version="6.0.0-alpha.1.20417.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>897dc03d976fa2c115c81c867c074c6cf5ece282</Sha>
+      <Sha>ede96af3fdf94ae6b149f10451d573c37fe27669</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0-rc.1.20419.5">
+    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0-alpha.1.20417.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>897dc03d976fa2c115c81c867c074c6cf5ece282</Sha>
+      <Sha>ede96af3fdf94ae6b149f10451d573c37fe27669</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-rc.1.20419.5">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0-alpha.1.20417.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>897dc03d976fa2c115c81c867c074c6cf5ece282</Sha>
+      <Sha>ede96af3fdf94ae6b149f10451d573c37fe27669</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-rc.1.20419.5">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0-alpha.1.20417.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>897dc03d976fa2c115c81c867c074c6cf5ece282</Sha>
+      <Sha>ede96af3fdf94ae6b149f10451d573c37fe27669</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-rc.1.20419.5">
+    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0-alpha.1.20417.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>897dc03d976fa2c115c81c867c074c6cf5ece282</Sha>
+      <Sha>ede96af3fdf94ae6b149f10451d573c37fe27669</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0-rc.1.20419.5">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-alpha.1.20417.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>897dc03d976fa2c115c81c867c074c6cf5ece282</Sha>
+      <Sha>ede96af3fdf94ae6b149f10451d573c37fe27669</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="5.0.0-rc.1.20419.5">
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.0-alpha.1.20417.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>897dc03d976fa2c115c81c867c074c6cf5ece282</Sha>
+      <Sha>ede96af3fdf94ae6b149f10451d573c37fe27669</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="5.0.0-rc.1.20419.5">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.0-alpha.1.20417.8">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>897dc03d976fa2c115c81c867c074c6cf5ece282</Sha>
+      <Sha>5099d918192f5df031e1ff5e3beea9cb361c605a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Configuration.Binder" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Configuration.Xml" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Composite" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Physical" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Hosting" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Hosting" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Http" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Http" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Logging.Configuration" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Logging.Console" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Logging.Debug" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Logging.EventSource" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Logging.EventLog" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Logging.TraceSource" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Options.DataAnnotations" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Options" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Options" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Primitives" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Primitives" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Internal.Transport" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.Internal.Transport" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Win32.SystemEvents" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Win32.SystemEvents" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.ComponentModel.Annotations" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.ComponentModel.Annotations" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Diagnostics.DiagnosticSource" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Diagnostics.EventLog" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Drawing.Common" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Drawing.Common" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.IO.Pipelines" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.IO.Pipelines" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.Json" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Net.Http.Json" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Net.Http.WinHttpHandler" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Net.Http.WinHttpHandler" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Net.WebSockets.WebSocketProtocol" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Reflection.Metadata" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Reflection.Metadata" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Resources.Extensions" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Resources.Extensions" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Runtime.CompilerServices.Unsafe" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
     <!-- System.Security.AccessControl should only be referenced in Dependencies.props and RTMVersions.csproj. -->
-    <Dependency Name="System.Security.AccessControl" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Security.AccessControl" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Security.Cryptography.Cng" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Security.Cryptography.Pkcs" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Security.Cryptography.Xml" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Permissions" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Security.Permissions" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Principal.Windows" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Security.Principal.Windows" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.ServiceProcess.ServiceController" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.ServiceProcess.ServiceController" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Text.Encodings.Web" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Text.Json" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Threading.Channels" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Threading.Channels" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="System.Windows.Extensions" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="System.Windows.Extensions" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
     <!--
          Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
          All Runtime.$rid packages should have the same version.
     -->
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-rc.1.20416.7">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-rc.1.20417.14">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>0862d48a9c9fbda879206b194a16d8e607deac42</Sha>
+      <Sha>907f7da59b40c80941b02ac2a46650adf3f606bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20411.8">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20417.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ecec08a0eebbd92bb9538e351d475582551d9092</Sha>
+      <Sha>83fda4b3f6d93e713749fd1b27c4a6d40b118b13</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20411.8">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20417.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ecec08a0eebbd92bb9538e351d475582551d9092</Sha>
+      <Sha>83fda4b3f6d93e713749fd1b27c4a6d40b118b13</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-2.20407.3">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.8.0-2.20414.4">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>dba2fa57432b4bd9cc7880e2c6fe3acdd01bba3c</Sha>
+      <Sha>beada51586dedc46a7fe5ca381ffb10e2b177070</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index ac700a988988..0d219eb240bb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -62,85 +62,85 @@
   -->
   <PropertyGroup Label="Automated">
     <!-- Packages from dotnet/roslyn -->
-    <MicrosoftNetCompilersToolsetPackageVersion>3.8.0-2.20407.3</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>3.8.0-2.20414.4</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- Packages from dotnet/runtime -->
-    <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.1.20416.7</MicrosoftNETCoreAppInternalPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>5.0.0-rc.1.20416.7</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-rc.1.20416.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftWin32RegistryPackageVersion>5.0.0-rc.1.20416.7</MicrosoftWin32RegistryPackageVersion>
-    <MicrosoftWin32SystemEventsPackageVersion>5.0.0-rc.1.20416.7</MicrosoftWin32SystemEventsPackageVersion>
-    <MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsCachingAbstractionsPackageVersion>
-    <MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsCachingMemoryPackageVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
-    <MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsConfigurationBinderPackageVersion>
-    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
-    <MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsConfigurationIniPackageVersion>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsConfigurationJsonPackageVersion>
-    <MicrosoftExtensionsConfigurationPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsConfigurationPackageVersion>
-    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
-    <MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsConfigurationXmlPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
-    <MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsFileProvidersCompositePackageVersion>
-    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
-    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
-    <MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsHostingAbstractionsPackageVersion>
-    <MicrosoftExtensionsHostingPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsHostingPackageVersion>
-    <MicrosoftExtensionsHttpPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsHttpPackageVersion>
-    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
-    <MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsLoggingConfigurationPackageVersion>
-    <MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsLoggingConsolePackageVersion>
-    <MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsLoggingDebugPackageVersion>
-    <MicrosoftExtensionsLoggingEventSourcePackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsLoggingEventSourcePackageVersion>
-    <MicrosoftExtensionsLoggingEventLogPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsLoggingEventLogPackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
-    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
-    <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
-    <MicrosoftExtensionsOptionsPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsOptionsPackageVersion>
-    <MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsPrimitivesPackageVersion>
-    <MicrosoftExtensionsInternalTransportPackageVersion>5.0.0-rc.1.20416.7</MicrosoftExtensionsInternalTransportPackageVersion>
-    <SystemComponentModelAnnotationsPackageVersion>5.0.0-rc.1.20416.7</SystemComponentModelAnnotationsPackageVersion>
-    <SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0-rc.1.20416.7</SystemDiagnosticsDiagnosticSourcePackageVersion>
-    <SystemDiagnosticsEventLogPackageVersion>5.0.0-rc.1.20416.7</SystemDiagnosticsEventLogPackageVersion>
-    <SystemDrawingCommonPackageVersion>5.0.0-rc.1.20416.7</SystemDrawingCommonPackageVersion>
-    <SystemIOPipelinesPackageVersion>5.0.0-rc.1.20416.7</SystemIOPipelinesPackageVersion>
-    <SystemNetHttpJsonPackageVersion>5.0.0-rc.1.20416.7</SystemNetHttpJsonPackageVersion>
-    <SystemNetHttpWinHttpHandlerPackageVersion>5.0.0-rc.1.20416.7</SystemNetHttpWinHttpHandlerPackageVersion>
-    <SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0-rc.1.20416.7</SystemNetWebSocketsWebSocketProtocolPackageVersion>
-    <SystemReflectionMetadataPackageVersion>5.0.0-rc.1.20416.7</SystemReflectionMetadataPackageVersion>
-    <SystemResourcesExtensionsPackageVersion>5.0.0-rc.1.20416.7</SystemResourcesExtensionsPackageVersion>
-    <SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-rc.1.20416.7</SystemRuntimeCompilerServicesUnsafePackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>5.0.0-rc.1.20417.14</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>5.0.0-rc.1.20417.14</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>5.0.0-rc.1.20417.14</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftWin32RegistryPackageVersion>5.0.0-rc.1.20417.14</MicrosoftWin32RegistryPackageVersion>
+    <MicrosoftWin32SystemEventsPackageVersion>5.0.0-rc.1.20417.14</MicrosoftWin32SystemEventsPackageVersion>
+    <MicrosoftExtensionsCachingAbstractionsPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsCachingAbstractionsPackageVersion>
+    <MicrosoftExtensionsCachingMemoryPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsCachingMemoryPackageVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
+    <MicrosoftExtensionsConfigurationBinderPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsConfigurationBinderPackageVersion>
+    <MicrosoftExtensionsConfigurationCommandLinePackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsConfigurationCommandLinePackageVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
+    <MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsConfigurationFileExtensionsPackageVersion>
+    <MicrosoftExtensionsConfigurationIniPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsConfigurationIniPackageVersion>
+    <MicrosoftExtensionsConfigurationJsonPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsConfigurationJsonPackageVersion>
+    <MicrosoftExtensionsConfigurationPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsConfigurationPackageVersion>
+    <MicrosoftExtensionsConfigurationUserSecretsPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsConfigurationUserSecretsPackageVersion>
+    <MicrosoftExtensionsConfigurationXmlPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsConfigurationXmlPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsFileProvidersAbstractionsPackageVersion>
+    <MicrosoftExtensionsFileProvidersCompositePackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsFileProvidersCompositePackageVersion>
+    <MicrosoftExtensionsFileProvidersPhysicalPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsFileProvidersPhysicalPackageVersion>
+    <MicrosoftExtensionsFileSystemGlobbingPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
+    <MicrosoftExtensionsHostingAbstractionsPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsHostingAbstractionsPackageVersion>
+    <MicrosoftExtensionsHostingPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsHostingPackageVersion>
+    <MicrosoftExtensionsHttpPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsHttpPackageVersion>
+    <MicrosoftExtensionsLoggingAbstractionsPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsLoggingAbstractionsPackageVersion>
+    <MicrosoftExtensionsLoggingConfigurationPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsLoggingConfigurationPackageVersion>
+    <MicrosoftExtensionsLoggingConsolePackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsLoggingConsolePackageVersion>
+    <MicrosoftExtensionsLoggingDebugPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsLoggingDebugPackageVersion>
+    <MicrosoftExtensionsLoggingEventSourcePackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsLoggingEventSourcePackageVersion>
+    <MicrosoftExtensionsLoggingEventLogPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsLoggingEventLogPackageVersion>
+    <MicrosoftExtensionsLoggingPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsLoggingPackageVersion>
+    <MicrosoftExtensionsLoggingTraceSourcePackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsLoggingTraceSourcePackageVersion>
+    <MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsOptionsConfigurationExtensionsPackageVersion>
+    <MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
+    <MicrosoftExtensionsOptionsPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsOptionsPackageVersion>
+    <MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsPrimitivesPackageVersion>
+    <MicrosoftExtensionsInternalTransportPackageVersion>5.0.0-rc.1.20417.14</MicrosoftExtensionsInternalTransportPackageVersion>
+    <SystemComponentModelAnnotationsPackageVersion>5.0.0-rc.1.20417.14</SystemComponentModelAnnotationsPackageVersion>
+    <SystemDiagnosticsDiagnosticSourcePackageVersion>5.0.0-rc.1.20417.14</SystemDiagnosticsDiagnosticSourcePackageVersion>
+    <SystemDiagnosticsEventLogPackageVersion>5.0.0-rc.1.20417.14</SystemDiagnosticsEventLogPackageVersion>
+    <SystemDrawingCommonPackageVersion>5.0.0-rc.1.20417.14</SystemDrawingCommonPackageVersion>
+    <SystemIOPipelinesPackageVersion>5.0.0-rc.1.20417.14</SystemIOPipelinesPackageVersion>
+    <SystemNetHttpJsonPackageVersion>5.0.0-rc.1.20417.14</SystemNetHttpJsonPackageVersion>
+    <SystemNetHttpWinHttpHandlerPackageVersion>5.0.0-rc.1.20417.14</SystemNetHttpWinHttpHandlerPackageVersion>
+    <SystemNetWebSocketsWebSocketProtocolPackageVersion>5.0.0-rc.1.20417.14</SystemNetWebSocketsWebSocketProtocolPackageVersion>
+    <SystemReflectionMetadataPackageVersion>5.0.0-rc.1.20417.14</SystemReflectionMetadataPackageVersion>
+    <SystemResourcesExtensionsPackageVersion>5.0.0-rc.1.20417.14</SystemResourcesExtensionsPackageVersion>
+    <SystemRuntimeCompilerServicesUnsafePackageVersion>5.0.0-rc.1.20417.14</SystemRuntimeCompilerServicesUnsafePackageVersion>
     <!-- System.Security.AccessControl should only be referenced in Dependencies.props and RTMVersions.csproj. -->
-    <SystemSecurityAccessControlPackageVersion>5.0.0-rc.1.20416.7</SystemSecurityAccessControlPackageVersion>
-    <SystemSecurityCryptographyCngPackageVersion>5.0.0-rc.1.20416.7</SystemSecurityCryptographyCngPackageVersion>
-    <SystemSecurityCryptographyPkcsPackageVersion>5.0.0-rc.1.20416.7</SystemSecurityCryptographyPkcsPackageVersion>
-    <SystemSecurityCryptographyXmlPackageVersion>5.0.0-rc.1.20416.7</SystemSecurityCryptographyXmlPackageVersion>
-    <SystemSecurityPermissionsPackageVersion>5.0.0-rc.1.20416.7</SystemSecurityPermissionsPackageVersion>
-    <SystemSecurityPrincipalWindowsPackageVersion>5.0.0-rc.1.20416.7</SystemSecurityPrincipalWindowsPackageVersion>
-    <SystemServiceProcessServiceControllerPackageVersion>5.0.0-rc.1.20416.7</SystemServiceProcessServiceControllerPackageVersion>
-    <SystemTextEncodingsWebPackageVersion>5.0.0-rc.1.20416.7</SystemTextEncodingsWebPackageVersion>
-    <SystemTextJsonPackageVersion>5.0.0-rc.1.20416.7</SystemTextJsonPackageVersion>
-    <SystemThreadingChannelsPackageVersion>5.0.0-rc.1.20416.7</SystemThreadingChannelsPackageVersion>
-    <SystemWindowsExtensionsPackageVersion>5.0.0-rc.1.20416.7</SystemWindowsExtensionsPackageVersion>
+    <SystemSecurityAccessControlPackageVersion>5.0.0-rc.1.20417.14</SystemSecurityAccessControlPackageVersion>
+    <SystemSecurityCryptographyCngPackageVersion>5.0.0-rc.1.20417.14</SystemSecurityCryptographyCngPackageVersion>
+    <SystemSecurityCryptographyPkcsPackageVersion>5.0.0-rc.1.20417.14</SystemSecurityCryptographyPkcsPackageVersion>
+    <SystemSecurityCryptographyXmlPackageVersion>5.0.0-rc.1.20417.14</SystemSecurityCryptographyXmlPackageVersion>
+    <SystemSecurityPermissionsPackageVersion>5.0.0-rc.1.20417.14</SystemSecurityPermissionsPackageVersion>
+    <SystemSecurityPrincipalWindowsPackageVersion>5.0.0-rc.1.20417.14</SystemSecurityPrincipalWindowsPackageVersion>
+    <SystemServiceProcessServiceControllerPackageVersion>5.0.0-rc.1.20417.14</SystemServiceProcessServiceControllerPackageVersion>
+    <SystemTextEncodingsWebPackageVersion>5.0.0-rc.1.20417.14</SystemTextEncodingsWebPackageVersion>
+    <SystemTextJsonPackageVersion>5.0.0-rc.1.20417.14</SystemTextJsonPackageVersion>
+    <SystemThreadingChannelsPackageVersion>5.0.0-rc.1.20417.14</SystemThreadingChannelsPackageVersion>
+    <SystemWindowsExtensionsPackageVersion>5.0.0-rc.1.20417.14</SystemWindowsExtensionsPackageVersion>
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
-    <MicrosoftNETCorePlatformsPackageVersion>5.0.0-rc.1.20416.7</MicrosoftNETCorePlatformsPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>5.0.0-rc.1.20417.14</MicrosoftNETCorePlatformsPackageVersion>
     <!-- Packages from dotnet/blazor -->
     <MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>3.2.0</MicrosoftAspNetCoreComponentsWebAssemblyRuntimePackageVersion>
     <!-- Packages from dotnet/efcore -->
-    <dotnetefPackageVersion>5.0.0-rc.1.20419.5</dotnetefPackageVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-rc.1.20419.5</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
-    <MicrosoftEntityFrameworkCoreRelationalPackageVersion>5.0.0-rc.1.20419.5</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>5.0.0-rc.1.20419.5</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
-    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>5.0.0-rc.1.20419.5</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
-    <MicrosoftEntityFrameworkCoreToolsPackageVersion>5.0.0-rc.1.20419.5</MicrosoftEntityFrameworkCoreToolsPackageVersion>
-    <MicrosoftEntityFrameworkCorePackageVersion>5.0.0-rc.1.20419.5</MicrosoftEntityFrameworkCorePackageVersion>
-    <MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.0-rc.1.20419.5</MicrosoftEntityFrameworkCoreDesignPackageVersion>
+    <dotnetefPackageVersion>6.0.0-alpha.1.20417.8</dotnetefPackageVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryPackageVersion>6.0.0-alpha.1.20417.8</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>
+    <MicrosoftEntityFrameworkCoreRelationalPackageVersion>6.0.0-alpha.1.20417.8</MicrosoftEntityFrameworkCoreRelationalPackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlitePackageVersion>6.0.0-alpha.1.20417.8</MicrosoftEntityFrameworkCoreSqlitePackageVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerPackageVersion>6.0.0-alpha.1.20417.8</MicrosoftEntityFrameworkCoreSqlServerPackageVersion>
+    <MicrosoftEntityFrameworkCoreToolsPackageVersion>6.0.0-alpha.1.20417.8</MicrosoftEntityFrameworkCoreToolsPackageVersion>
+    <MicrosoftEntityFrameworkCorePackageVersion>6.0.0-alpha.1.20417.8</MicrosoftEntityFrameworkCorePackageVersion>
+    <MicrosoftEntityFrameworkCoreDesignPackageVersion>6.0.0-alpha.1.20417.8</MicrosoftEntityFrameworkCoreDesignPackageVersion>
   </PropertyGroup>
   <!--
 
diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake
index 2566707997b0..137736c0a272 100644
--- a/eng/common/cross/toolchain.cmake
+++ b/eng/common/cross/toolchain.cmake
@@ -19,7 +19,9 @@ if(TARGET_ARCH_NAME STREQUAL "armel")
   endif()
 elseif(TARGET_ARCH_NAME STREQUAL "arm")
   set(CMAKE_SYSTEM_PROCESSOR armv7l)
-  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf)
+  if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv7-alpine-linux-musleabihf)
+    set(TOOLCHAIN "armv7-alpine-linux-musleabihf")
+  elseif(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/armv6-alpine-linux-musleabihf)
     set(TOOLCHAIN "armv6-alpine-linux-musleabihf")
   else()
     set(TOOLCHAIN "arm-linux-gnueabihf")
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index 0e79a546b553..e814d5e0334a 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -39,6 +39,7 @@ parameters:
   NetEngLatestChannelId: 2
   NetEngValidationChannelId: 9
   NetDev5ChannelId: 131
+  NetDev6ChannelId: 1296
   GeneralTestingChannelId: 529
   NETCoreToolingDevChannelId: 548
   NETCoreToolingReleaseChannelId: 549
@@ -46,7 +47,6 @@ parameters:
   NETCoreExperimentalChannelId: 562
   NetEngServicesIntChannelId: 678
   NetEngServicesProdChannelId: 679
-  Net5Preview7ChannelId: 1065
   Net5Preview8ChannelId: 1155
   Net5RC1ChannelId: 1157
   NetCoreSDK313xxChannelId: 759
@@ -115,7 +115,7 @@ stages:
           inputs:
             filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
             arguments: -PromoteToChannels "$(TargetChannels)"
-              -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
+              -AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
 
     - job:
       displayName: NuGet Validation
@@ -276,13 +276,13 @@ stages:
       dependsOn: ${{ parameters.publishDependsOn }}
       publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
       symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
-      stageName: 'Net5_Preview7_Publish'
-      channelName: '.NET 5 Preview 7'
-      akaMSChannelName: 'net5/preview7'
-      channelId: ${{ parameters.Net5Preview7ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
+      stageName: 'NetCore_Dev6_Publish'
+      channelName: '.NET 6 Dev'
+      akaMSChannelName: 'net6/dev'
+      channelId: ${{ parameters.NetDev6ChannelId }}
+      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json'
+      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json'
+      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-symbols/nuget/v3/index.json'
 
   - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
     parameters:
@@ -298,7 +298,7 @@ stages:
       shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json'
       symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json'
 
-  - template: \eng\common\templates\post-build\channels\generic-internal-channel.yml
+  - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
     parameters:
       artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
       dependsOn: ${{ parameters.publishDependsOn }}
@@ -308,9 +308,9 @@ stages:
       channelName: '.NET 5 RC 1'
       akaMSChannelName: 'net5/rc1'
       channelId: ${{ parameters.Net5RC1ChannelId }}
-      transportFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v3/index.json'
-      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v3/index.json'
-      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-symbols/nuget/v3/index.json'
+      transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
+      shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
+      symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
 
   - template: \eng\common\templates\post-build\channels\generic-public-channel.yml
     parameters:
diff --git a/global.json b/global.json
index d810659eaf81..89bda8ddbdd0 100644
--- a/global.json
+++ b/global.json
@@ -30,7 +30,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.15.2",
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20411.8",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20411.8"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20417.6",
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20417.6"
   }
 }
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs
index 15f1df532a52..99971dfae8e5 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs
@@ -37,7 +37,7 @@ public class WeatherForecastController : ControllerBase
 
         private readonly ILogger<WeatherForecastController> _logger;
 
-        // The Web API will only accept tokens 1) for users, and 2) having the access_as_user scope for this API
+        // The Web API will only accept tokens 1) for users, and 2) having the api-scope scope for this API
         static readonly string[] scopeRequiredByApi = new string[] { "api-scope" };
 
 #if (GenerateApi)
@@ -75,7 +75,7 @@ public WeatherForecastController(ILogger<WeatherForecastController> logger,
         {
              _logger = logger;
             _graphServiceClient = graphServiceClient;
-       }
+        }
 
         [HttpGet]
         public async Task<IEnumerable<WeatherForecast>> Get()
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html
index e2017f6ce6f8..672af16a9f7d 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirectiveWithViewImports_DesignTime.codegen.html
@@ -1 +1 @@
-                         
\ No newline at end of file
+~~~~~~~~~~ ~~~~~~~~~~~~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html
index e7b0219a389d..212a52af7b23 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/BasicComponent_DesignTime.codegen.html
@@ -1,9 +1,9 @@
-                       
-<div class="                ">
+~~~~~~~~~~~ ~~~~~~~~~~~
+<div class="~~~~~~~~~~~~~~~~">
     Hello world
-                                  
+    ~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
 </div>
 
-            
-                                 
- 
+~~~~~~~~~~ ~
+    ~~~~ ~~~~~~~~~~~~~~~~~~~~~~ ~
+~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html
index 08d042e89793..1d05c8edd11c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Basic_DesignTime.codegen.html
@@ -1,8 +1,8 @@
-<div class="                ">
+<div class="~~~~~~~~~~~~~~~~">
     Hello world
-                                  
+    ~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
 </div>
-   
-                    
- 
-<p class="                         " />
+~~ 
+    ~~~ ~~~ ~ ~~~~~~
+~
+<p class="~~~~~~~ ~~ ~~~~~ ~ ~~~~ ~" />
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
index 85fabc0abd8a..41bd21fb73e0 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
@@ -1,15 +1,15 @@
-                                                                                   
+~~ ~~~~~ ~~~~ ~~~~~ ~~~~~~~~ ~~~~ ~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~ ~~~~~~ ~~
 
-     
-      
-      "
+~~~~~
+~~~~~ 
+~~~~~ "
 
-      
-       
+~~~~~~
+~~~~~~ 
 
-       
-        
-                         
+~~~~~~~
+~~~~~~~ 
+~~~~~~~ ~~~~~~~~~~~~~~~~~
 
-          
-           
+~~~~~~~~~~
+~~~~~~~~~~ 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html
index 6adf1586e10f..7c8f96178083 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsViewModel_DesignTime.codegen.html
@@ -1,2 +1,2 @@
-                                    
-              
+~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html
index b1214751a93b..cc39225641f6 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InheritsWithViewImports_DesignTime.codegen.html
@@ -1,2 +1,2 @@
-     
-              
+~~~~~
+~~~~~~ ~~~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html
index b05e435fdae9..b9ccc4dd9435 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithModel_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-              
-                            
-                              
+~~~~~~ ~~~~~~~
+~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~
+~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html
index 0c20f0ce0ce5..6b3f658f9627 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InjectWithSemicolon_DesignTime.codegen.html
@@ -1,5 +1,5 @@
-              
-                                
-                                 
-                                  
-                                    
+~~~~~~ ~~~~~~~
+~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~~   
+~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~~  
+~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~~  ~  
+~~~~~~~ ~~~~~~~~~~~~~~~~~ ~~~~~  ~  
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html
index 8a218bdd8dad..579717aaec4e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inject_DesignTime.codegen.html
@@ -1 +1 @@
-                            
+~~~~~~~ ~~~~~ ~~~~~~~~~~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html
index c72931e132ba..8a36a67848ae 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InvalidNamespaceAtEOF_DesignTime.codegen.html
@@ -1 +1 @@
-           Test.
\ No newline at end of file
+~~~~~~~~~~ Test.
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html
index 9645bac584dd..ef573d0f478c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MalformedPageDirective_DesignTime.codegen.html
@@ -1,4 +1,4 @@
-      "foo
+~~~~~ "foo
 
 <h1>About Us</h1>
 <p>We are awesome.</p>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html
index 4649d9d2d64b..0109819d0a0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ModelExpressionTagHelper_DesignTime.codegen.html
@@ -1,6 +1,6 @@
-               
+~~~~~~ ~~~~~~~~
 
-                                           
+~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
 
-<input-test for="    " />
-<input-test for="      " />
+<input-test for="~~~~" />
+<input-test for="~~~~~~" />
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html
index 1638a82fb44c..9eb7434ef14a 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Model_DesignTime.codegen.html
@@ -1 +1 @@
-                                     
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html
index 4a2f4743cfc7..338f2c39940e 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MultipleModels_DesignTime.codegen.html
@@ -1,2 +1,2 @@
-                            
-                                     
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html
index 6742b0a9e33d..f3527d34b88c 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/PageWithNamespace_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-     
-                         
+~~~~~
+~~~~~~~~~~ ~~~~~~~~~~~~~~
 <h1>Hi There!</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html
index 8f9ba3e6233b..e1debaeb457f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPageWithNoLeadingPageDirective_DesignTime.codegen.html
@@ -1,2 +1,2 @@
 <div>Some text here.</div>
-     
+~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html
index dbfd76ba01f2..6ea17442f79b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithRouteTemplate_DesignTime.codegen.html
@@ -1,13 +1,13 @@
-              
+~~~~~ ~~~~~~~~
 
-               
-                                          
+~~~~~~ ~~~~~~~~
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-            
-                                     
-     
-                                        
-     
- 
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~ ~~~~~~~~ ~ ~~~~~~~~~
+    ~
+        ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
+    ~
+~
 
-<h1>New Customer            </h1>
+<h1>New Customer ~~~~~~~~~~~</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html
index ae827b127094..1788ff55ca6f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPagesWithoutModel_DesignTime.codegen.html
@@ -1,28 +1,28 @@
-     
+~~~~~
 
-                          
-                                          
+~~~~~~~~~~~~~ ~~~ ~~~~~~~~
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-            
-                                                  
-     
-                             
-                                                         
-     
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~ ~~~~~~~~~
+    ~
+        ~~~~ ~ ~~~~~~~~~~~~~~
+        ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~
 
-                                    
+    ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
 
-                         
-     
-                                        
-     
- 
+    ~~~~~~ ~~~~~ ~~~~~~~~
+    ~
+        ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
+    ~
+~
 
 <h1>New Customer</h1>
 <form method="post" class="form-horizontal">
     <div class="text-danger"></div>
     <div class="form-group">
-        <label class="col-md-2 control-label">     </label>
+        <label class="col-md-2 control-label">~~~~~</label>
         <div class="col-md-10">
             <input class="form-control" />
             <span class="text-danger"></span>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html
index dc0c2ec4e1b7..3bc18cff89a6 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorPages_DesignTime.codegen.html
@@ -1,32 +1,32 @@
-     
+~~~~~
 
-               
-                          
-                                          
+~~~~~~ ~~~~~~~~
+~~~~~~~~~~~~~ ~~~ ~~~~~~~~
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-            
-                                     
-     
-                                                      
-         
-                                 
-                                                             
-         
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~ ~~~~~~~~ ~ ~~~~~~~~~
+    ~
+        ~~~~~~ ~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~ ~~~~~~~~~
+        ~
+            ~~~~ ~ ~~~~~~~~~~~~~~
+            ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ~
 
-                                        
-     
+        ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
+    ~
 
-                         
-     
-                                        
-     
- 
+    ~~~~~~ ~~~~~ ~~~~~~~~
+    ~
+        ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
+    ~
+~
 
 <h1>New Customer</h1>
 <form method="post" class="form-horizontal" >
     <div class="text-danger"></div>
     <div class="form-group">
-        <label class="col-md-2 control-label">           </label>
+        <label class="col-md-2 control-label">~~~~~~~~~~~</label>
         <div class="col-md-10">
             <input class="form-control" />
             <span class="text-danger"></span>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
index 849f18b01572..1dc5378382f5 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
@@ -1,14 +1,14 @@
-               
+~~~~~~ ~~~~~~~~
 
-                                           
+~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~
 
-   
-                                         
- 
+~~ 
+    ~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~
 
 <div>Some body</div>
 
-                   
+~~~~~~~~ ~~~~~~~~ ~
     <div>This is in Section 1</div>
-    <input-test for="    " />
- 
\ No newline at end of file
+    <input-test for="~~~~" />
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html
index 52fe51a13096..38bab0bda99b 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UsingDirectives_DesignTime.codegen.html
@@ -1,4 +1,4 @@
-                            
-                         
-             
-             
\ No newline at end of file
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~
+~~~~~~ ~~~~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html
index 5b456be824f8..e3c647d97a4f 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.html
@@ -1,6 +1,6 @@
-                          
-  
-                      
- 
+~~~~~~~~~~~~~ ~~~ ~~~~~~~~
+~~
+    ~~~ ~~~ ~ ~~~~~~~~
+~
 
-<vc:test first-name="    " bar=" World"></vc:test>
\ No newline at end of file
+<vc:test first-name="~~~~" bar=" World"></vc:test>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html
index 835b3a68caea..30c2f53307d5 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewWithNamespace_DesignTime.codegen.html
@@ -1,2 +1,2 @@
-                         
+~~~~~~~~~~ ~~~~~~~~~~~~~~
 <h1>Hi There!</h1>
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html
index 262e601e9cc7..f53681d3d2e4 100644
--- a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/_ViewImports_DesignTime.codegen.html
@@ -1 +1 @@
-                                  
\ No newline at end of file
+~~~~~~~ ~~~~~~~~~~~~~~~~~~~ ~~~~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs
index 6d29531efb9f..d8c06a379dcf 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/RazorHtmlWriter.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -141,7 +141,7 @@ private void WriteToken(SyntaxToken token)
                 return;
             }
 
-            // We're in non-HTML context. Let's replace all non-whitespace chars with a space.
+            // We're in non-HTML context. Let's replace all non-whitespace chars with a tilde(~).
             foreach (var c in content)
             {
                 if (char.IsWhiteSpace(c))
@@ -150,7 +150,7 @@ private void WriteToken(SyntaxToken token)
                 }
                 else
                 {
-                    Builder.Append(' ');
+                    Builder.Append('~');
                 }
             }
         }
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html
index 0da46f2152d1..9798fda642fa 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AddTagHelperDirective_DesignTime.codegen.html
@@ -1 +1 @@
-                               
+~~~~~~~~~~~~~ ~~~ ~~~~~~~~~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html
index fd82d1980659..bc07a83107e3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/AttributeDirective_DesignTime.codegen.html
@@ -1,6 +1,6 @@
-                                                                   
-                                                              
-                                                                             
-                                                       
+~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~
+~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
 
 Hello World
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html
index 22593ca1ef47..9206eae15e5b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Await_DesignTime.codegen.html
@@ -1,26 +1,26 @@
-            
-                                   
-     
-                     
-     
- 
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~ ~~~~~~~~~~~~ ~~~~~
+    ~
+        ~~~~~~ ~~~~~~
+    ~
+~
 
 <section>
     <h1>Basic Asynchronous Expression Test</h1>
-    <p>Basic Asynchronous Expression:             </p>
-    <p>Basic Asynchronous Template:               </p>
-    <p>Basic Asynchronous Statement:                  </p>
-    <p>Basic Asynchronous Statement Nested:    <b>            </b>  </p>
-    <p>Basic Incomplete Asynchronous Statement:       </p>
+    <p>Basic Asynchronous Expression: ~~~~~~ ~~~~~</p>
+    <p>Basic Asynchronous Template: ~~~~~~~ ~~~~~~</p>
+    <p>Basic Asynchronous Statement: ~~ ~~~~~ ~~~~~~ ~</p>
+    <p>Basic Asynchronous Statement Nested: ~~ <b>~~~~~~ ~~~~~</b> ~</p>
+    <p>Basic Incomplete Asynchronous Statement: ~~~~~~</p>
 </section>
 
 <section>
     <h1>Advanced Asynchronous Expression Test</h1>
-    <p>Advanced Asynchronous Expression:                 </p>
-    <p>Advanced Asynchronous Expression Extended:                     </p>
-    <p>Advanced Asynchronous Template:                          </p>
-    <p>Advanced Asynchronous Statement:                                           </p>
-    <p>Advanced Asynchronous Statement Extended:                         </p>
-    <p>Advanced Asynchronous Statement Nested:    <b>                            </b>  </p>
-    <p>Advanced Incomplete Asynchronous Statement:                     </p>
+    <p>Advanced Asynchronous Expression: ~~~~~~ ~~~~~~ ~~</p>
+    <p>Advanced Asynchronous Expression Extended: ~~~~~~ ~~~~~~~~~~ ~~</p>
+    <p>Advanced Asynchronous Template: ~~~~~~~ ~~~~~~~~~~ ~~~~~~</p>
+    <p>Advanced Asynchronous Statement: ~~ ~~~~~ ~~~~~~~~~~~~~~ ~~~~~~ ~~~~~~~~~ ~</p>
+    <p>Advanced Asynchronous Statement Extended: ~~ ~~~~~ ~~~~~~~~~~ ~~ ~</p>
+    <p>Advanced Asynchronous Statement Nested: ~~ <b>~~~~~~ ~~~~~~~~~~~~~~ ~~~~~~</b> ~</p>
+    <p>Advanced Incomplete Asynchronous Statement: ~~~~~~ ~~~~~~~~~~~~~</p>
 </section>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html
index dc08c79219d9..b36df6862afd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Blocks_DesignTime.codegen.html
@@ -1,37 +1,37 @@
-  
-              
- 
+~~
+    ~~~ ~ ~ ~~
+~
 
-                 
-    <p>Hello from C#, #    </p>
-           
- 
+~~~~~~~~ ~~ ~~~ ~
+    <p>Hello from C#, #~~~~</p>
+    ~ ~~ ~~
+~
 
-              
+~~~~~ ~~ ~~~ ~
     <p>We wrote 10 lines!</p>
- 
+~
 
-            
-            
+~~~~~~~~~~ ~
+    ~~~~ ~~~
         <p>No really, we wrote 10 lines!</p>
-              
-            
+        ~~~~~~
+    ~~~~~~~~
         <p>Actually, we didn't...</p>
-              
- 
+        ~~~~~~
+~
 
-                                  
-    <p>Hello again from C#, #    </p>
- 
+~~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~ ~~ ~~ ~
+    <p>Hello again from C#, #~~~~</p>
+~
 
-      
+~~~~ ~
     <p>That time, we wrote 5 lines!</p>
-                       
-    <p>Oh no! An error occurred:              </p>
- 
+~ ~~~~~~~~~~~~~~~ ~~~ ~
+    <p>Oh no! An error occurred: ~~~~~~~~~~~~~</p>
+~
 
-<p>i is now   </p>
+<p>i is now ~~</p>
 
-                     
+~~~~~~~~~ ~~~~~~~~~ ~
     <p>This block is locked, for your security!</p>
- 
\ No newline at end of file
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html
index a2aad32abe93..d3e8f46d6bae 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp7_DesignTime.codegen.html
@@ -1,43 +1,43 @@
 <body>
-      
-                                                                                                    
-         
-                                                
-          
+    ~~
+        ~~~ ~~~~~~~~~~ ~ ~~~ ~~~~~~~~~~~~~~~~~~ ~~~~~~~ ~~~~~~~~~~ ~~~~~~ ~~~~~~~~~ ~~~~~~ ~~~~~~~~~
+        ~
+            ~~~~~~ ~~~~~ ~ ~~~~~~~~ ~~~~~~ ~~~~~
+        ~~
 
-                                                     
+        ~~ ~~~~ ~~ ~~~ ~~ ~ ~~~~ ~~~~ ~~~~~~ ~~~~~ ~~
 
-                                  
-                                                   
-                                                           
-                                                                                             
-     
+        ~~~ ~~~~~~~ ~ ~~~~~~~~~~~~
+        ~~~~ ~~~~~~~~~~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~
+        ~~~~~~ ~~~~~~~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~
+        ~~~~~~~ ~~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~
 
-                                                           
-     
-                                      
-         
-                           
-         
-     
+    ~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~ ~~~ ~~~ ~~~~~~~
+    ~
+        ~~ ~~~~~~~~~~~~ ~~ ~~~~ ~~~~~~
+        ~
+            ~~ ~~ ~~~~~~~~~
+        ~
+    ~
     <p>
-        Here's a very unique number:                                                                  
+        Here's a very unique number: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     </p>
 
     <div>
-                                                                
+        ~~~~~~~~~ ~~~~~~~ ~~~~~ ~~~~~~~~~~~~~ ~~ ~~~~~ ~~~~~~ ~~
     </div>
 
-                         
-     
-                     
-                           
-                  
-                                               
-                                
-                  
-                  
-                                        
-                  
-     
+    ~~~~~~~ ~~~~~~~~~~~~~
+    ~
+        ~~~~ ~~~ ~~~~
+            ~~ ~~ ~~~~~~~~~
+            ~~~~~~
+        ~~~~ ~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~
+            ~~ ~~ ~~~~ ~~~~~~~~~
+            ~~~~~~
+        ~~~~ ~~~~~
+            ~~ ~~ ~~~~ ~~~~ ~~ ~~~~~~~~~
+            ~~~~~~
+    ~
 </body>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html
index 2e0ee4dc6ebb..25245b195da1 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CSharp8_DesignTime.codegen.html
@@ -1,67 +1,67 @@
-                                 
+~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-  
-                                               
-     
-                    
-     
+~~
+    ~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~
+    ~
+        ~~~~~~ ~~~~~
+    ~
 
-                                                   
-     
+    ~~~~~ ~~~~~~~ ~~~~ ~~~ ~~ ~~~~~~~~~~~~~~~~~~~~~
+    ~
 
-     
+    ~
 
-                       
-                                                           
+    ~~~~~ ~~~~~ ~ ~~~~~
+    ~~~~~ ~~~ ~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-                                      
-                             
-                             
-     
-                              
-     
- 
+    ~~~ ~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~
+    ~~~ ~~~~~~~~ ~ ~~~~~~~~~~
+    ~~~~~~ ~~~~~~~~ ~~~~~~~~~
+    ~
+        ~~~~~~ ~~~~~~~~~~~~~~~
+    ~
+~
 
-            
-                
+~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~
 
-                 
- 
-                                   
-                                     
-                      
-  
+~~~~~~~~~~ ~~~~~~
+~
+    ~~~~~~~~~~~~~~ ~~ ~~~~ ~~~~~~~~
+    ~~~~~~~~~~~~~~~ ~~ ~~~~ ~~~~~~~~~
+    ~ ~~ ~~~~ ~~~~~~~~
+~~
 
-                                                
- 
-        
- 
+~~~~~~ ~~~~~~~ ~~~~ ~~~ ~~ ~~~~~~~~~~~~~~~~~~~~~
+~
+    ~~~~
+~
 
-             
-                     
-                      
+~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~
 
-            
-                 
-     
-              
-              
-     
+~~~~~~~~~~ ~
+    ~~~~ ~~~~~~~~
+    ~
+        ~~~~~~
+        ~~~~~~
+    ~
 
-                                                     
-     
-                                                                 
-                                      
-     
+    ~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~
+    ~
+        ~~~ ~~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~
+    ~
 
-                                       
+    ~~~~~~~ ~~~~~~ ~~~~~~ ~ ~~~~ ~~~~ ~
 
-                                          
+    ~~~~~~~ ~~~~~~~~~ ~~~~~~ ~ ~~~~ ~~~~ ~
 
-                                                          
+    ~~~~~~~ ~~~~~~~~~~~ ~~~~~~~~ ~~~~~~~~~~~ ~ ~~~~ ~~~~ ~
 
-                       
-     
-                                         
-     
- 
\ No newline at end of file
+    ~~~~~~~ ~~~~~ ~~~~~
+    ~
+        ~~~~~~ ~~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
+    ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html
index 136d06384a4c..68db24f6303b 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockAtEOF_DesignTime.codegen.html
@@ -1 +1 @@
-  
\ No newline at end of file
+~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html
index a6e01f1a0e64..738f635fb736 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlockWithTextElement_DesignTime.codegen.html
@@ -1,4 +1,4 @@
-  
-               <text>foo</text> 		
-              			<text>bar       </text>
- 
+~~
+    ~~~ ~ ~ ~~ <text>foo</text> 		
+    ~~~ ~ ~ ~~			<text>bar ~~~~~~</text>
+~
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html
index f857199dcf16..9a924676bc4d 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/CodeBlock_DesignTime.codegen.html
@@ -1,5 +1,5 @@
-  
-                                  
-                                                                    
-     
- 
\ No newline at end of file
+~~
+    ~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~~~~ ~
+        ~~~~~~~~~~~~~~~~~~~~~~ ~~~~ ~~~ ~~ ~ ~~~~~~~~~~~~ ~ ~~~~~~~~
+    ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html
index 46a4402680ba..6d16f3df2c5f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ConditionalAttributes_DesignTime.codegen.html
@@ -1,15 +1,15 @@
-  
-                  
-                    
+~~
+    ~~~ ~~ ~ ~~~~~
+    ~~~ ~~~ ~ ~~~~~~
     <a href="Foo" />
-    <p class="    " />
-    <p class="foo     " />
-    <p class="     foo" />
-    <input type="checkbox" checked="   " />
-    <input type="checkbox" checked="foo    " />
-    <p class="                         " />
+    <p class="~~~~" />
+    <p class="foo ~~~~" />
+    <p class="~~~~ foo" />
+    <input type="checkbox" checked="~~~" />
+    <input type="checkbox" checked="foo ~~~" />
+    <p class="~~~~~~~ ~~ ~~~~~ ~ ~~~~ ~" />
     <a href="~/Foo" />
-    <script src="                                             " type="text/javascript"></script>
-    <script src="                                                             " type="text/javascript"></script>
+    <script src="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" type="text/javascript"></script>
+    <script src="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" type="text/javascript"></script>
     <script src="http://ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>
- 
\ No newline at end of file
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html
index be5ba4979a03..a8754ea813a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/DesignTime_DesignTime.codegen.html
@@ -1,15 +1,15 @@
 <div>
-                                           
-    <p>This is item #  </p>
-             
+            ~~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~~~~ ~
+    <p>This is item #~~</p>
+            ~
 </div>
 
 <p>
-               
-      <p>Bar      Biz</p> 
+~~~~~~~~~~~~~~~
+~~~~~~<p>Bar ~~~~ Biz</p>~
 </p>
 
-                 
+~~~~~~~~ ~~~~~~ ~
     <p>Foo</p>
-        
- 
\ No newline at end of file
+    ~~~~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html
index 9ebe0e3a7822..99a7f08ac047 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyCodeBlock_DesignTime.codegen.html
@@ -1,3 +1,3 @@
 This is markup
 
-   
\ No newline at end of file
+~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html
index 9ebe0e3a7822..99a7f08ac047 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyExplicitExpression_DesignTime.codegen.html
@@ -1,3 +1,3 @@
 This is markup
 
-   
\ No newline at end of file
+~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html
index 1568f6aa34f3..0c15e1469835 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpressionInCode_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-  
-     
- 
\ No newline at end of file
+~~
+    ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html
index 76ee36910b47..758fb714e81e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/EmptyImplicitExpression_DesignTime.codegen.html
@@ -1,3 +1,3 @@
 This is markup
 
- !
\ No newline at end of file
+~!
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html
index 6eaf3f7aa0bd..d166c19f55a0 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionAtEOF_DesignTime.codegen.html
@@ -1,3 +1,3 @@
 This is markup
 
-  
\ No newline at end of file
+~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html
index fc593178498f..b410eec8a5e2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpressionWithMarkup_DesignTime.codegen.html
@@ -1 +1 @@
-<div>   </div>
\ No newline at end of file
+<div>~~~</div>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html
index 33b749a2f937..152cef197aeb 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExplicitExpression_DesignTime.codegen.html
@@ -1 +1 @@
-1 + 1 =       
\ No newline at end of file
+1 + 1 = ~~~~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html
index de86958addfc..557c25099c9c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ExpressionsInCode_DesignTime.codegen.html
@@ -1,16 +1,16 @@
-  
-                      
-                       
- 
+~~
+    ~~~~~~ ~~~ ~ ~~~~~
+    ~~~~~~ ~~~ ~ ~~~~~~
+~
 
-                  
-        
-        
+~~~~~~~ ~~ ~~~~~ ~
+    ~~~~
+~ ~~~~ ~
     <p>Foo is Null!</p>
- 
+~
 
 <p>
-                                 
-                            
- 
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~
+    ~~~~~~~~~~~~~~~~~~ ~~~~~
+~
 </p>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html
index 6393f9703b5f..2a7f3ddff8a3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlockMinimal_DesignTime.codegen.html
@@ -1,7 +1,7 @@
 
 
-	           
-                          
-	                   
- 
- 
\ No newline at end of file
+	~~~~~~~~~~~
+~~~~~~ ~~~~~~~~~~ ~~~~~~ ~
+	~~~~~~ ~~~~~ ~ ~~~~
+~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html
index 46d84b460b85..896d2c841527 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/FunctionsBlock_DesignTime.codegen.html
@@ -1,12 +1,12 @@
-            
+~~~~~~~~~~ ~
 
- 
+~
 
-            
-                                
-                             
-                            
-     
- 
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~ ~ ~~~ ~~~~~~~~~
+    ~~~~~~~ ~~~ ~~~~~~~~~~~ ~
+        ~~~~~~ ~~~~~~~~~~~~~
+    ~
+~
 
-Here's a random number:             
\ No newline at end of file
+Here's a random number: ~~~~~~~~~~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html
index 13484a1b456c..88647e0895ab 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/HiddenSpansInCode_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-  
-        
- 
\ No newline at end of file
+~~
+    ~~~~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html
index d0776340e1a6..8d87a8e68a75 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Implements_DesignTime.codegen.html
@@ -1,5 +1,5 @@
-                       
+~~~~~~~~~~~ ~~~~~~~~~~~
 
-            
-                                  
- 
\ No newline at end of file
+~~~~~~~~~~ ~
+    ~~~~ ~~~~~~~~~~~~~~~~~~~~~ ~ ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html
index f1c2edafa225..28138a2cddf2 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpressionAtEOF_DesignTime.codegen.html
@@ -1,3 +1,3 @@
 This is markup
 
- 
\ No newline at end of file
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html
index c3ca733a2bc7..b8f7cde9f741 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ImplicitExpression_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-                               
-    <p>This is item #  </p>
- 
\ No newline at end of file
+~~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~~~~ ~
+    <p>This is item #~~</p>
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
index b7d08f385618..d932435cea17 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/IncompleteDirectives_DesignTime.codegen.html
@@ -1,25 +1,25 @@
-                                                                                   
+~~ ~~~~~ ~~~~ ~~~~~ ~~~~~~~~ ~~~~ ~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~~~~~ ~~~~~ ~~~~~~ ~~
 
-             
-              
-               
+~~~~~~~~~~~~~
+~~~~~~~~~~~~~ 
+~~~~~~~~~~~~~ ~
 
-                
-                 
-                  
+~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~ 
+~~~~~~~~~~~~~~~~ ~
 
-                
-                 
-                  
+~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~ 
+~~~~~~~~~~~~~~~~ ~
 
-         
-          
+~~~~~~~~~
+~~~~~~~~~ 
 
-          
-           
+~~~~~~~~~~
+~~~~~~~~~~ 
 
-        
-         
+~~~~~~~~
+~~~~~~~~ 
 
-         {
-            
\ No newline at end of file
+~~~~~~~~ {
+~~~~~~~~~~ ~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html
index b60ac0100e38..9cd1d59959a7 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Inherits_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-                               
+~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~
 
-      
\ No newline at end of file
+~~~~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html
index 3b6fa1cd0620..18ebd6d308e5 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/InlineBlocks_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-             (string link) {
-    <a href="                                   <text>#</text>  " />
+~~~~~~~~ ~~~~(string link) {
+    <a href="~~~~~~~~ ~~ ~~~~~ ~ ~~~~~ ~ ~~~~ ~ <text>#</text> ~" />
 }
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html
index 111d1f7474ce..1c44204c9352 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Instrumented_DesignTime.codegen.html
@@ -1,38 +1,38 @@
-  
-              
-               <p>Bar</p> 
-      Hello, World
+~~
+    ~~~ ~ ~ ~~
+    ~~~ ~~~ ~ ~<p>Bar</p>~
+    ~~Hello, World
     <p>Hello, World</p>
- 
+~
 
-                 
-    <p>Hello from C#, #    </p>
-           
- 
+~~~~~~~~ ~~ ~~~ ~
+    <p>Hello from C#, #~~~~</p>
+    ~ ~~ ~~
+~
 
-              
+~~~~~ ~~ ~~~ ~
     <p>We wrote 10 lines!</p>
- 
+~
 
-            
-            
+~~~~~~~~~~ ~
+    ~~~~ ~~~
         <p>No really, we wrote 10 lines!</p>
-              
-            
+        ~~~~~~
+    ~~~~~~~~
         <p>Actually, we didn't...</p>
-              
- 
+        ~~~~~~
+~
 
-                                  
-    <p>Hello again from C#, #    </p>
- 
+~~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~ ~~ ~~ ~
+    <p>Hello again from C#, #~~~~</p>
+~
 
-      
+~~~~ ~
     <p>That time, we wrote 5 lines!</p>
-                       
-    <p>Oh no! An error occurred:              </p>
- 
+~ ~~~~~~~~~~~~~~~ ~~~ ~
+    <p>Oh no! An error occurred: ~~~~~~~~~~~~~</p>
+~
 
-                     
+~~~~~~~~~ ~~~~~~~~~ ~
     <p>This block is locked, for your security!</p>
- 
\ No newline at end of file
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html
index 9148ce732370..ad3e1315f2bd 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/MarkupInCodeBlock_DesignTime.codegen.html
@@ -1,5 +1,5 @@
-  
-                                  
-        <p>Hello from C#, #               </p>
-     
- 
+~~
+    ~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~~~~ ~
+        <p>Hello from C#, #~~~~~~~~~~~~~~~</p>
+    ~
+~
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html
index 4b346c914a4b..554040f8c49a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Markup_InCodeBlocks_DesignTime.codegen.html
@@ -1,45 +1,45 @@
 
-  
-                             
-     
-                                                   
-      
-
-                                 
-     
-        <div>            </div>
-     
- 
-
-                         
-                                 
-
-            
-                                        
-     
-                                             
+~~
+    ~~~ ~~~~~~ ~ ~~~ ~~~~~~~~
+    ~
+        ~~~ ~~~~~~~~ ~ ~~~~ ~ ~~~~~~~~~ ~~~ ~ ~~~ ~
+    ~~
+
+    ~~~~ ~~~~~~~~~~~~~~~~ ~~~~~~~
+    ~
+        <div>~~~~~~~~~~~~</div>
+    ~
+~
+
+~~ ~~~~~~~~~~~~~~~~~~~~ ~
+~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~
+
+~~~~~~~~~~ ~
+    ~~~~ ~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~
+    ~
+        ~~~ ~~~~~~~~~ ~ ~~~~~ ~~~~~~~~~~~~~~~
         <div>
-            <h3>Happy birthday             !</h3>
+            <h3>Happy birthday ~~~~~~~~~~~~!</h3>
         </div>
 
         <ul>
-                                                  
-         
-            <li>     Happy birthday!</li>
-         
+        ~~~~ ~~~~ ~ ~ ~~ ~ ~ ~~~~~~~~~~ ~ ~~~ ~~~~
+        ~
+            <li>~~~~ Happy birthday!</li>
+        ~
         </ul>
 
-                            
-         
-                   
-         
+        ~~ ~~~~~~~~~~~ ~ ~~~
+        ~
+            ~~~~~~~
+        ~
 
         <h4>Secret message</h4>
-     
-
-                
-     
-                                        
-                                    
-     
- 
\ No newline at end of file
+    ~
+
+    ~~~~~ ~~~~~~
+    ~
+        ~~~~~~ ~~~~~~ ~~~~ ~ ~~~~ ~~~~ ~
+        ~~~~~~ ~~~ ~~~ ~ ~~~~ ~~~~ ~
+    ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html
index c1b9240ee07a..1a78d3888c91 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCSharp_DesignTime.codegen.html
@@ -1,8 +1,8 @@
-  
-                                         
-     
+~~
+    ~~~~~~~~ ~~~~ ~~~~~~ ~~ ~~~~~~~~~~~~~
+    ~
         <div>
-                             .
+            ~~~~~~~~~~~~~~~~~.
         </div>
-     
- 
\ No newline at end of file
+    ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html
index c56380dfcb99..966b588e290f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NestedCodeBlocks_DesignTime.codegen.html
@@ -1,4 +1,4 @@
-          
-              
-     
- 
\ No newline at end of file
+~~~~~~~~ ~
+    ~~~~~~~~ ~
+    ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html
index b7c02278c1d0..494393779b10 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NoLinePragmas_DesignTime.codegen.html
@@ -1,38 +1,38 @@
-  
-              
- 
+~~
+    ~~~ ~ ~ ~~
+~
 
-                 
-    <p>Hello from C#, #    </p>
-           
- 
+~~~~~~~~ ~~ ~~~ ~
+    <p>Hello from C#, #~~~~</p>
+    ~ ~~ ~~
+~
 
-              
+~~~~~ ~~ ~~~ ~
     <p>We wrote 10 lines!</p>
- 
+~
 
-            
-            
+~~~~~~~~~~ ~
+    ~~~~ ~~~
         <p>No really, we wrote 10 lines!</p>
-              
-            
+        ~~~~~~
+    ~~~~~~~~
         <p>Actually, we didn't...</p>
-              
- 
+        ~~~~~~
+~
 
-                                  
-    <p>Hello again from C#, #    </p>
- 
+~~~~~~~~ ~ ~ ~~ ~ ~~ ~~~ ~ ~~ ~~ ~
+    <p>Hello again from C#, #~~~~</p>
+~
 
-      
+~~~~ ~
     <p>That time, we wrote 5 lines!</p>
-                       
-    <p>Oh no! An error occurred:              </p>
- 
+~ ~~~~~~~~~~~~~~~ ~~~ ~
+    <p>Oh no! An error occurred: ~~~~~~~~~~~~~</p>
+~
 
-                                  
-<p>i is now   </p>
+~~ ~~~~ ~~~ ~~ ~~~~~~~~~~ ~~ ~~ ~~
+<p>i is now ~~</p>
 
-                     
+~~~~~~~~~ ~~~~~~~~~ ~
     <p>This block is locked, for your security!</p>
- 
\ No newline at end of file
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html
index 7ad423b1f29e..e40e3c6f4954 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/NullConditionalExpressions_DesignTime.codegen.html
@@ -1,11 +1,11 @@
-  
-                  
-                           
-                               
-                                              
- 
+~~
+    ~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~
 
-              
-                       
-                           
-                                          
\ No newline at end of file
+~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html
index 1675f6438378..42ba9c64b06a 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/OpenedIf_DesignTime.codegen.html
@@ -1,5 +1,5 @@
 <html>
 <body>
-             
+~~~ ~~~~~~ ~ 
 </body>
 </html>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html
index d0076463280f..61e3b424cb11 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ParserError_DesignTime.codegen.html
@@ -1,5 +1,5 @@
-  
-  
-          
-          
- 
\ No newline at end of file
+~~
+~~
+~~~ ~ ~~~~
+~~~ ~ ~~~~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html
index f851e2e59774..d4faa3491649 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RazorComments_DesignTime.codegen.html
@@ -1,18 +1,18 @@
-                                    
-<p>This should           be shown</p>
+~~~~~~ ~~ ~~~ ~~~~~ ~~ ~~ ~~~~~~~~~~
+<p>This should ~~ ~~~ ~~ be shown</p>
 
-  
-                                       
-                                                       
-                     
-                  
-     
- 
+~~
+    ~~ ~~~~~ ~~~ ~~~~~~~~~~~~~ ~~~~~ ~~
+    ~~~~~~~~~ ~~~ ~ ~~ ~~~ ~~~~~~~~~~~~~ ~~~~~ ~~ ~~~~~
+    ~~~~~~ ~~ ~~~~~ ~
+        ~~~~~ ~~~~
+    ~
+~
 
-                           
-<p>But this should show the comment syntax:     </p>
+~~ ~~~ ~~~ ~ ~~~ ~~~ ~~~~ ~
+<p>But this should show the comment syntax: ~~~~</p>
 
-         
+~~~~~~~~~
 
 <input value="@*this razor comment is the actual value*@" type="text" />
-<input                                             type="text" />
+<input ~~~~~~ ~~~~~ ~~~~~~~ ~~~~ ~~~ ~~ ~~~~~~~~~~ type="text" />
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html
index 77def406f5ff..1460ade1eacc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/RemoveTagHelperDirective_DesignTime.codegen.html
@@ -1 +1 @@
-                                
+~~~~~~~~~~~~~~~~ ~~ ~~~~~~~~~~~~
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
index 72ff37f26cb5..b47779a0df74 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Sections_DesignTime.codegen.html
@@ -1,17 +1,17 @@
-  
-                                        
- 
+~~
+    ~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~
 
 <div>This is in the Body>
 
-                   
-    <div class="some       ">This is in Section 2</div>
- 
+~~~~~~~~ ~~~~~~~~ ~
+    <div class="some ~~~~~~">This is in Section 2</div>
+~
 
-                   
+~~~~~~~~ ~~~~~~~~ ~
     <div>This is in Section 1</div>
- 
+~
 
-                          
-                                  <span>     </span>   
- 
\ No newline at end of file
+~~~~~~~~ ~~~~~~~~~~~~~~~ ~
+    ~~ ~~~~~~~~~~~~~ ~~~~~~~ ~ ~ ~<span>~~~~~</span>~ ~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html
index 11a63ced54cf..221eda5a6c0f 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SimpleUnspacedIf_DesignTime.codegen.html
@@ -1,4 +1,4 @@
-          
- 
+~~~ ~~~~~~
+~
 	<div></div>
- 
\ No newline at end of file
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html
index 3d06dc8b909c..897f7e85741e 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/SingleLineControlFlowStatements_DesignTime.codegen.html
@@ -1,102 +1,102 @@
 <p>Before Text</p>
 
-  
-                                                                                                
-
-                
-     
-                                             
-                                                    
-                                                  
-                                                    
-            
-                                
-     
-
-                                
-                                
-            
-
-                                          
-             
-
-      
-                     
-                                
-
-                                
-                       
-
-                                                                 
-                           
-
-                
-                       
- 
-
-            
-                       
-     
-                   
-
-                                             
-                                                    
-            
-                                               
+~~
+    ~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~ ~ ~~ ~~ ~~~~~~~~~~ ~~~~ ~~ ~~~~~~~~~ ~~ ~~~ ~~~~ ~~~~~~~~~~~~~
+
+    ~~~~~~ ~~~~~
+    ~
+        ~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~ ~ ~~ ~~
+            ~~~~~~ ~~~~~~~~ ~~~~ ~~ ~~~~~~~~~ ~~ ~~~
+        ~~~~ ~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~ ~ ~~ ~~
+            ~~~~~~ ~~~~~~~~ ~~~~ ~~ ~~~~~~~~~ ~~ ~~~
+        ~~~~
+            ~~~~~~ ~~~~~~~~~~~~~
+    ~
+
+    ~~~ ~~~~ ~ ~ ~~ ~ ~ ~~~ ~~~~
+        ~~ ~~~~~~~~~~~~ ~ ~~~~~~
+        ~~~~
+
+    ~~~~~~~~ ~~~~ ~~~~ ~~ ~~~~~ ~~~~~~~~~~
+        ~~~~~
+
+    ~~
+        ~~~~~~~~~~~~~
+    ~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~
+
+    ~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~
+        ~~~~~~~~~~~~~~~
+
+    ~~~~~ ~~~~ ~~~~~~ ~ ~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        ~~~~~~~~~~~~~~~~~~~
+
+    ~~~~~ ~~~~~~
+        ~~~~~~~~~~~~~~~
+~
+
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~~ ~~~~~
+    ~
+        ~~~ ~ ~ ~~~
+
+        ~~ ~~~~~~~~~~~~~~~~~~~~~~~~ ~ ~ ~~ ~~
+            ~~~~~~ ~~~~~~~~ ~~~~ ~~ ~~~~~~~~~ ~~ ~~~
+        ~~~~
+            ~~~~~~ ~~~ ~~~~~ ~~~~~~~~~ ~~ ~~~~~
         
-                                    
-                                    
-                
+        ~~~ ~~~~ ~ ~ ~~ ~ ~ ~~~ ~~~~
+            ~~ ~~~~~~~~~~~~ ~ ~~~~~~
+            ~~~~
 
-                                             
-                 
+        ~~~~~~~ ~~~~ ~~~~ ~~ ~~~~~ ~~~~~~~~~~
+            ~~~~~
 
-          
-                         
-                                    
+        ~~
+            ~~~~~~~~~~~~~
+        ~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~
 
-                                    
-                           
+        ~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~
+            ~~~~~~~~~~~~~~~
 
-                                                                     
-                               
+        ~~~~~ ~~~~ ~~~~~~ ~ ~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~~~~~~~~~~~~~~~~~~~
 
-                   
-                           
-     
+        ~~~~ ~~~~~~
+            ~~~~~~~~~~~~~~~
+    ~
 
-                         
+    ~~~ ~~~~~~~~~~~~ ~ ~~
 
-                                
-     
-                                 
-     
+    ~~~~~~ ~~~~ ~~~~~~~~~~~~~~~~
+    ~
+        ~~ ~~~~~~ ~~~~~~~~~~~~~~~
+    ~
 
- 
+~
 
-                             
-      
+~~~~ ~~~~ ~ ~ ~~ ~ ~ ~~~ ~~~~
+    ~~
 
-                                      
-         
+~~~~~~~~ ~~~~ ~~~~ ~~ ~~~~~ ~~~~~~~~~~
+    ~~~~~
 
-   
-                 
-                            
+~~~
+    ~~~~~~~~~~~~~
+~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~
 
-                             
-                   
+~~~~~~ ~~~~~~~~~~~~~~~ ~~ ~~~
+    ~~~~~~~~~~~~~~~
 
-                                                              
-                              
-                       
+~~~~~~ ~~~~ ~~~~~~ ~ ~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~ ~~~~~~~ ~~~ ~~~~~~ ~~~~
+    ~~~~~~~~~~~~~~~~~~~
 
-            
-                   
+~~~~~ ~~~~~~
+    ~~~~~~~~~~~~~~~
 
-                            <p>Hello!</p>
+~~~ ~~~~~~ ~~~~~~~~~~~~~~~~ <p>Hello!</p>
 
-           
-       <p>The time is              </p>
+~~~ ~~~~~~ 
+    ~~ <p>The time is ~~~~~~~~~~~~~</p>
 
 <p>After Text</p>
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html
index b47c6a931ccb..823fe9a3eed3 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/StringLiterals_DesignTime.codegen.html
@@ -83,7 +83,7 @@
 <p>This is line 83</p>
 <p>This is line 84</p><br>
 
-                                
+~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~ ~
     <p>This is line 1 nested</p>
     <p>This is line 2 nested</p>
     <p>This is line 3 nested</p>
@@ -159,7 +159,7 @@
     <p>This is line 73 nested</p>
     <p>This is line 74 nested</p>
     <p>This is line 75 nested</p>
- 
+~
 <p>This is line 1</p>
 <p>This is line 2</p>
 <p>This is line 3</p>
@@ -203,7 +203,7 @@
 <p>This is line 41</p>
 <p>This is line 42</p>
 <p>This is line 43</p>hi!
-                                    
+~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~ ~
     <p>This is line 1 nested</p>
     <p>This is line 2 nested</p>
     <p>This is line 3 nested</p>
@@ -234,4 +234,4 @@
     <p>This is line 28 nested</p>
     <p>This is line 29 nested</p>
     <p>30</p>
- !
\ No newline at end of file
+~!
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html
index 419c13c11c9b..0dfbab3b0cdc 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Tags_DesignTime.codegen.html
@@ -1,6 +1,6 @@
-  
-    <script type="text/javascript"     ></script @foo >
- 
+~~
+    <script type="text/javascript" ~~~ ></script @foo >
+~
 
 <script type="text/html">
     <%var x = window == null%>
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.html
index de0b7355257d..258ea1baf85c 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Templates_DesignTime.codegen.html
@@ -1,53 +1,53 @@
-            
-                                                                       
-                                             
-                                            
-                                                            
-             
-           
-     
- 
-
-  
-                                 <text>This works      !</text> 
-            
- 
-
-   
-                                 <p class="     ">Hello</p> 
-                   
- 
+~~~~~~~~~~ ~
+    ~~~~~~ ~~~~~~~~~~~~ ~~~~~~~~~~ ~~~~~~ ~~~~~~~~~ ~~~~~~~ ~~~~~~~~~ ~
+        ~~~~~~ ~~~ ~~~~~~~~~~~~~~~~~~~~~ ~~ ~
+            ~~~~~~~ ~ ~ ~~ ~ ~ ~~~~~~ ~~~~ ~
+                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            ~
+        ~~~
+    ~
+~
+
+~~
+    ~~~~~~~~~~~~~ ~~~~~~~ ~~~ ~ ~<text>This works ~~~~~!</text>~
+    ~~~~~~~~
+~
+
+~~ 
+    ~~~~~~~~~~~~~ ~~~~~~~ ~~~ ~ ~<p class="~~~~~">Hello</p>~
+    ~~~~~~~~~~~~~~~
+~
 
 <ul>
-              <li>Item #     </li>  
+~~~~~~~~~~~~ ~<li>Item #~~~~~</li>~~
 </ul>
 
 <p>
-           
-       This is line#      of markup<br/>
- 
+~~~~~~~~~~~
+    ~~ This is line#~~~~~ of markup<br/>
+~
 </p>
 
 <p>
-           
-      : This is line#      of markup<br />
- 
+~~~~~~~~~~~
+    ~~: This is line#~~~~~ of markup<br />
+~
 </p>
 
 <p>
-           
-      :: This is line#      of markup<br />
- 
+~~~~~~~~~~~
+    ~~:: This is line#~~~~~ of markup<br />
+~
 </p>
 
 
 <ul>
-                 <li>
-        Item #     
-                             
+    ~~~~~~~~~~~ ~<li>
+        Item #~~~~~
+        ~~~~~ ~~~~~~ ~ ~~~~~~
         <ul>
             <li>Child Items... ?</li>
-                                                           
+            ~~~~~~~~~~~~ ~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~
         </ul>
-    </li> 
+    </li>~
 </ul> 
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.html
index ae3e23d828ff..0af197d017d9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/UnfinishedExpressionInCode_DesignTime.codegen.html
@@ -1,3 +1,3 @@
-  
-          
- 
\ No newline at end of file
+~~
+~~~~~~~~~~
+~
\ No newline at end of file
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.html b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.html
index d16439d97500..47226d1ee8c9 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.html
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/Usings_DesignTime.codegen.html
@@ -1,15 +1,15 @@
-                
-                                 
-             
+~~~~~~ ~~~~~~~~~
+~~~~~~ ~~~ ~ ~~~~~~~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~
 
-                    
-                            
-                                          
+~~~~~~ ~~~~~~ ~~~~~~
+~~~~~~ ~~~~~~ ~~~~~~~~~~~~~~
+~~~~~~ ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-   
-                                                               
-                                                                                        
- 
+~~ 
+    ~~~~~ ~~~ ~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    ~~~~~ ~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~ ~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~
 
-<p>Path's full type name is                       </p>
-<p>Foo's actual full type name is                      </p>
\ No newline at end of file
+<p>Path's full type name is ~~~~~~~~~~~~~~~~~~~~~~</p>
+<p>Foo's actual full type name is ~~~~~~~~~~~~~~~~~~~~~</p>
\ No newline at end of file
diff --git a/src/Servers/Kestrel/Core/src/Systemd/KestrelServerOptionsSystemdExtensions.cs b/src/Servers/Kestrel/Core/src/Systemd/KestrelServerOptionsSystemdExtensions.cs
index 6def39159de2..bf8f0fe69437 100644
--- a/src/Servers/Kestrel/Core/src/Systemd/KestrelServerOptionsSystemdExtensions.cs
+++ b/src/Servers/Kestrel/Core/src/Systemd/KestrelServerOptionsSystemdExtensions.cs
@@ -11,11 +11,12 @@ namespace Microsoft.AspNetCore.Hosting
     public static class KestrelServerOptionsSystemdExtensions
     {
         // SD_LISTEN_FDS_START https://www.freedesktop.org/software/systemd/man/sd_listen_fds.html
-        private const ulong SdListenFdsStart = 3;
+        private const int SdListenFdsStart = 3;
         private const string ListenPidEnvVar = "LISTEN_PID";
+        private const string ListenFdsEnvVar = "LISTEN_FDS";
 
         /// <summary>
-        /// Open file descriptor (SD_LISTEN_FDS_START) initialized by systemd socket-based activation logic if available.
+        /// Open file descriptors (starting from SD_LISTEN_FDS_START) initialized by systemd socket-based activation logic if available.
         /// </summary>
         /// <returns>
         /// The <see cref="KestrelServerOptions"/>.
@@ -26,7 +27,7 @@ public static KestrelServerOptions UseSystemd(this KestrelServerOptions options)
         }
 
         /// <summary>
-        /// Open file descriptor (SD_LISTEN_FDS_START) initialized by systemd socket-based activation logic if available.
+        /// Open file descriptors (starting from SD_LISTEN_FDS_START) initialized by systemd socket-based activation logic if available.
         /// Specify callback to configure endpoint-specific settings.
         /// </summary>
         /// <returns>
@@ -36,7 +37,16 @@ public static KestrelServerOptions UseSystemd(this KestrelServerOptions options,
         {
             if (string.Equals(Process.GetCurrentProcess().Id.ToString(CultureInfo.InvariantCulture), Environment.GetEnvironmentVariable(ListenPidEnvVar), StringComparison.Ordinal))
             {
-                options.ListenHandle(SdListenFdsStart, configure);
+                // This matches sd_listen_fds behavior that requires %LISTEN_FDS% to be present and in range [1;INT_MAX-SD_LISTEN_FDS_START]
+                if (int.TryParse(Environment.GetEnvironmentVariable(ListenFdsEnvVar), NumberStyles.None, NumberFormatInfo.InvariantInfo, out var listenFds)
+                    && listenFds > 0
+                    && listenFds <= int.MaxValue - SdListenFdsStart)
+                {
+                    for (var handle = SdListenFdsStart; handle < SdListenFdsStart + listenFds; ++handle)
+                    {
+                        options.ListenHandle((ulong)handle, configure);
+                    }
+                }
             }
 
             return options;